X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FDaemon%2FDaemon.hh;h=e38a62c09b4ed6a5779df817e3344a2c65bb3707;hb=a726ae0cb14d0ce37e5aab3c4e07121bbbd3b31c;hp=89e2d53fe27273ae931c5102e93f0720d6ce56c5;hpb=2c6294b3a810ee64e117df1b0da01d6b120534bb;p=senf.git

diff --git a/Utils/Daemon/Daemon.hh b/Utils/Daemon/Daemon.hh
index 89e2d53..e38a62c 100644
--- a/Utils/Daemon/Daemon.hh
+++ b/Utils/Daemon/Daemon.hh
@@ -23,8 +23,8 @@
 /** \file
     \brief Daemon public header */
 
-#ifndef HH_Daemon_
-#define HH_Daemon_ 1
+#ifndef HH_SENF_Utils_Daemon_Daemon_
+#define HH_SENF_Utils_Daemon_Daemon_ 1
 
 // Custom includes
 #include <boost/utility.hpp>
@@ -157,7 +157,7 @@ namespace senf {
                                              successful startup. */
 
         int argc();                     ///< Access command line parameter count
-        char ** argv();                 ///< Access command line parameters
+        char const ** argv();           ///< Access command line parameters
         void removeDaemonArgs();        ///< Remove the daemon arguments from argc()/argv()
 
         static void exit(unsigned code=0); ///< Terminate daemon with failure
@@ -168,7 +168,7 @@ namespace senf {
 
         ///\}
         
-        int start(int argc, char ** argv); ///< Called from main() to launch daemon.
+        int start(int argc, char const ** argv); ///< Called from main() to launch daemon.
                                         /**< Normally not called directly but from the
                                              \ref SENF_DAEMON_MAIN macro. */
 
@@ -211,7 +211,7 @@ namespace senf {
         void installSighandlers();
 
         int argc_;
-        char ** argv_;
+        char const ** argv_;
 
         bool daemonize_;
         std::string stdoutLog_;
@@ -234,7 +234,7 @@ namespace senf {
         \ingroup process
      */
 #   define SENF_DAEMON_MAIN(klass)                                                                \
-        int main(int argc, char ** argv)                                                    \
+        int main(int argc, char const ** argv)                                                    \
         {                                                                                         \
             klass instance;                                                                       \
             return instance.start(argc, argv);                                                    \
@@ -243,7 +243,7 @@ namespace senf {
 }
 
 ///////////////////////////////hh.e////////////////////////////////////////
-//#include "Daemon.cci"
+#include "Daemon.cci"
 //#include "Daemon.ct"
 //#include "Daemon.cti"
 #endif