diff options
author | Martin Carpenter <mcarpenter@free.fr> | 2013-04-24 09:47:53 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-04-24 09:47:53 +0200 |
commit | bf52ef7e7e212f12b97eb87b3d21c050f455bc0e (patch) | |
tree | 22dee03385572462f69ae9384f57821a40f23273 | |
parent | 1244a50d85925d9b2a7d1ef615a2c9390977d2bf (diff) | |
download | rsyslog-bf52ef7e7e212f12b97eb87b3d21c050f455bc0e.tar.gz rsyslog-bf52ef7e7e212f12b97eb87b3d21c050f455bc0e.tar.bz2 rsyslog-bf52ef7e7e212f12b97eb87b3d21c050f455bc0e.zip |
fix compile on Solaris
-rw-r--r-- | ChangeLog | 2 | ||||
-rwxr-xr-x | compat/getifaddrs.c | 10 |
2 files changed, 11 insertions, 1 deletions
@@ -4,6 +4,8 @@ Version 7.3.12 [devel] 2013-04-?? Thanks to Radu Gheorghe for the doc contribution. - platform compatibility enhancement: solve compile issue with libgcrypt do not use GCRY_CIPHER_MODE_AESWRAP where not available +- fix compile on Solaris + Thanks to Martin Carpenter for the patch. - bugfix: block size limit was not properly honored - bugfix: potential segfault in guardtime signature provider it could segfault if an error was reported by the GuardTime API, because diff --git a/compat/getifaddrs.c b/compat/getifaddrs.c index 8acd4840..25d04d4d 100755 --- a/compat/getifaddrs.c +++ b/compat/getifaddrs.c @@ -36,7 +36,15 @@ #include <stdlib.h> #include <net/if.h> #include <ifaddrs.h> -#include <libsocket_priv.h> + +/* Normally this is defined in <net/if.h> but was new for Solaris 11 */ +#ifndef LIFC_ENABLED +#define LIFC_ENABLED 0x20 +#endif + +int getallifaddrs(sa_family_t af, struct ifaddrs **ifap, int64_t flags); +int getallifs(int s, sa_family_t af, struct lifreq **lifr, int *numifs, + int64_t lifc_flags); /* * Create a linked list of `struct ifaddrs' structures, one for each |