From: Gurucharan Shetty <gshetty@nicira.com>
Date: Wed, 23 Apr 2014 16:03:38 +0000 (-0700)
Subject: daemon: Rename daemon.c as daemon-unix.c
X-Git-Tag: sliver-openvswitch-2.2.90-1~3^2~79
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=a91dc4447bb6c6bd8807aaaa4e00af0abe4fa5c7

daemon: Rename daemon.c as daemon-unix.c

An upcoming commit re-introduces daemon.c to have
common functions across daemon-unix.c and daemon-windows.c

Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/lib/automake.mk b/lib/automake.mk
index fcd2c5b58..e904f8836 100644
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -251,7 +251,7 @@ lib_libopenvswitch_la_SOURCES += \
 	lib/stream-fd-windows.c
 else
 lib_libopenvswitch_la_SOURCES += \
-	lib/daemon.c \
+	lib/daemon-unix.c \
 	lib/latch-unix.c \
 	lib/signals.c \
 	lib/signals.h \
diff --git a/lib/daemon.c b/lib/daemon-unix.c
similarity index 99%
rename from lib/daemon.c
rename to lib/daemon-unix.c
index c1c6550a9..74914a435 100644
--- a/lib/daemon.c
+++ b/lib/daemon-unix.c
@@ -36,7 +36,7 @@
 #include "util.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(daemon);
+VLOG_DEFINE_THIS_MODULE(daemon_unix);
 
 /* --detach: Should we run in the background? */
 static bool detach;             /* Was --detach specified? */
diff --git a/lib/daemon-windows.c b/lib/daemon-windows.c
index 0893755ae..f059fc519 100644
--- a/lib/daemon-windows.c
+++ b/lib/daemon-windows.c
@@ -21,7 +21,7 @@
 #include "poll-loop.h"
 #include "vlog.h"
 
-VLOG_DEFINE_THIS_MODULE(daemon);
+VLOG_DEFINE_THIS_MODULE(daemon_windows);
 
 static bool service_create;          /* Was --service specified? */
 static bool service_started;         /* Have we dispatched service to start? */