[ovs-dev] [PATCH 1/3] daemon: Rename daemon.c as daemon-unix.c

Gurucharan Shetty shettyg at nicira.com
Thu Apr 24 15:31:02 UTC 2014


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 at nicira.com>
---
 lib/automake.mk                 |    2 +-
 lib/{daemon.c => daemon-unix.c} |    2 +-
 lib/daemon-windows.c            |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/{daemon.c => daemon-unix.c} (99%)

diff --git a/lib/automake.mk b/lib/automake.mk
index fcd2c5b..e904f88 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 c1c6550..74914a4 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 0893755..f059fc5 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? */
-- 
1.7.9.5




More information about the dev mailing list