[PATCH 19/19] variable name fix (DBUS_DAEMON_NAME instead of DAEMON_NAME)

Romain Pokrzywka romain at kdab.com
Fri Feb 5 00:54:16 PST 2010


---
 bus/main.c           |    2 +-
 cmake/config.h.cmake |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bus/main.c b/bus/main.c
index 45e08f0..50f47dc 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -74,7 +74,7 @@ signal_handler (int sig)
 static void
 usage (void)
 {
-  fprintf (stderr, DAEMON_NAME " [--version] [--session] [--system] [--config-file=FILE] [--print-address[=DESCRIPTOR]] [--print-pid[=DESCRIPTOR]] [--fork] [--nofork] [--introspect]\n");
+  fprintf (stderr, DBUS_DAEMON_NAME " [--version] [--session] [--system] [--config-file=FILE] [--print-address[=DESCRIPTOR]] [--print-pid[=DESCRIPTOR]] [--fork] [--nofork] [--introspect]\n");
   exit (1);
 }
 
diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index 5f78347..bc40ec2 100644
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -11,7 +11,7 @@
 #cmakedefine DBUS_BINDIR   "@DBUS_BINDIR@"
 #cmakedefine DBUS_SYSTEM_CONFIG_FILE  "@DBUS_SYSTEM_CONFIG_FILE@"
 #cmakedefine DBUS_SESSION_CONFIG_FILE "@DBUS_SESSION_CONFIG_FILE@"
-#cmakedefine DAEMON_NAME "@DAEMON_NAME@"
+#cmakedefine DBUS_DAEMON_NAME "@DBUS_DAEMON_NAME@"
 #cmakedefine DBUS_SYSTEM_BUS_DEFAULT_ADDRESS  "@DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@"
 #cmakedefine DBUS_MACHINE_UUID_FILE "@DBUS_MACHINE_UUID_FILE@"
 //#cmakedefine DBUS_SESSION_BUS_DEFAULT_ADDRESS "@DBUS_SESSION_BUS_DEFAULT_ADDRESS@"
-- 
1.6.4.msysgit.0


--------------010102030105080700010509
Content-Type: text/plain;
 name="0013-remove-DBUS_DAEMON_EXECUTABLE_NAME-we-already-have-D.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename*0="0013-remove-DBUS_DAEMON_EXECUTABLE_NAME-we-already-have-D.pa";
 filename*1="tch"



More information about the dbus mailing list