diff options
| author | Lukas Larsson <[email protected]> | 2014-11-25 11:55:04 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-11-25 11:55:04 +0100 |
| commit | c18819e771228cb76c07ae88467d56e09e446165 (patch) | |
| tree | 9f3f66107da5fdbebfd17d5b9e1dca20be266936 /erts/epmd/src/epmd_int.h | |
| parent | b0a48f37a5c04d158369cc69d5a8afafd67663cd (diff) | |
| parent | c181536aabe2140d3547ba34c6b7ef2ae0109c65 (diff) | |
| download | otp-c18819e771228cb76c07ae88467d56e09e446165.tar.gz otp-c18819e771228cb76c07ae88467d56e09e446165.tar.bz2 otp-c18819e771228cb76c07ae88467d56e09e446165.zip | |
Merge branch 'maint'
* maint:
epmd: Unify systemd autoconf macros usage
epmd: Added systemd notify support to EPMD
Diffstat (limited to 'erts/epmd/src/epmd_int.h')
| -rw-r--r-- | erts/epmd/src/epmd_int.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/epmd/src/epmd_int.h b/erts/epmd/src/epmd_int.h index c8f2192f7f..52badd7086 100644 --- a/erts/epmd/src/epmd_int.h +++ b/erts/epmd/src/epmd_int.h @@ -125,9 +125,9 @@ # include "sys/select.h" #endif -#ifdef HAVE_SYSTEMD_SD_DAEMON_H +#ifdef HAVE_SYSTEMD_DAEMON # include <systemd/sd-daemon.h> -#endif +#endif /* HAVE_SYSTEMD_DAEMON */ /* ************************************************************************ */ /* Replace some functions by others by making the function name a macro */ @@ -340,9 +340,9 @@ typedef struct { int listenfd[MAX_LISTEN_SOCKETS]; char *addresses; char **argv; -#ifdef HAVE_SYSTEMD_SD_DAEMON_H +#ifdef HAVE_SYSTEMD_DAEMON int is_systemd; -#endif +#endif /* HAVE_SYSTEMD_DAEMON */ } EpmdVars; void dbg_printf(EpmdVars*,int,const char*,...); |