diff options
| author | Alexander Bokovoy <abokovoy@redhat.com> | 2016-05-25 14:31:09 +0300 |
|---|---|---|
| committer | Alexander Bokovoy <abokovoy@redhat.com> | 2016-05-25 14:31:09 +0300 |
| commit | 45a08328c028ea057cd108b0a978c8e7372f2e9b (patch) | |
| tree | 2ebbad440c6025a76072b6760b2200f4e8d66bdb | |
| parent | 0acf45b17873e468c585d845585f7cba395dffbf (diff) | |
Updated the patch to use defined()
| -rw-r--r-- | samba-use-libsystemd.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/samba-use-libsystemd.patch b/samba-use-libsystemd.patch index 2fe68d8..114b771 100644 --- a/samba-use-libsystemd.patch +++ b/samba-use-libsystemd.patch @@ -7,7 +7,7 @@ index 4622971907..04d77da529 100644 #include "system/filesys.h" #include "system/locale.h" -#if HAVE_LIBSYSTEMD_DAEMON -+#if HAVE_LIBSYSTEMD_DAEMON || HAVE_LIBSYSTEMD ++#if defined(HAVE_LIBSYSTEMD_DAEMON) || defined(HAVE_LIBSYSTEMD) #include <systemd/sd-daemon.h> #endif #include "lib/util/close_low_fd.h" @@ -16,7 +16,7 @@ index 4622971907..04d77da529 100644 newpid = fork(); if (newpid) { -#if HAVE_LIBSYSTEMD_DAEMON -+#if HAVE_LIBSYSTEMD_DAEMON || HAVE_LIBSYSTEMD ++#if defined(HAVE_LIBSYSTEMD_DAEMON) || defined(HAVE_LIBSYSTEMD) sd_notifyf(0, "READY=0\nSTATUS=Starting process...\nMAINPID=%lu", (unsigned long) newpid); #endif /* HAVE_LIBSYSTEMD_DAEMON */ _exit(0); @@ -25,7 +25,7 @@ index 4622971907..04d77da529 100644 _PUBLIC_ void exit_daemon(const char *msg, int error) { -#ifdef HAVE_LIBSYSTEMD_DAEMON -+#if HAVE_LIBSYSTEMD_DAEMON || HAVE_LIBSYSTEMD ++#if defined(HAVE_LIBSYSTEMD_DAEMON) || defined(HAVE_LIBSYSTEMD) if (msg == NULL) { msg = strerror(error); } @@ -34,7 +34,7 @@ index 4622971907..04d77da529 100644 name = "Samba"; } -#ifdef HAVE_LIBSYSTEMD_DAEMON -+#if HAVE_LIBSYSTEMD_DAEMON || HAVE_LIBSYSTEMD ++#if defined(HAVE_LIBSYSTEMD_DAEMON) || defined(HAVE_LIBSYSTEMD) sd_notifyf(0, "READY=1\nSTATUS=%s: ready to serve connections...", name); #endif DEBUG(0, ("STATUS=daemon '%s' finished starting up and ready to serve " @@ -43,7 +43,7 @@ index 4622971907..04d77da529 100644 name = "Samba"; } -#ifdef HAVE_LIBSYSTEMD_DAEMON -+#if HAVE_LIBSYSTEMD_DAEMON || HAVE_LIBSYSTEMD ++#if defined(HAVE_LIBSYSTEMD_DAEMON) || defined(HAVE_LIBSYSTEMD) sd_notifyf(0, "\nSTATUS=%s: %s", name, msg); #endif DEBUG(0, ("STATUS=daemon '%s' : %s", name, msg)); |