From 99936729cdd81a628b61e62197069ab2e3ea7a58 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 26 Dec 2007 10:01:40 +0000 Subject: moved cross-platform define for AI_NUMERICSERV to net.h --- ChangeLog | 3 +++ net.h | 13 +++++++++++++ syslogd.c | 13 ------------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4032842b..f6af3d9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ --------------------------------------------------------------------------- +Version 2.0.0 (rgerhards), 2007-12-26 +- increased portability for older platforms (AI_NUMERICSERV moved) +--------------------------------------------------------------------------- Version 1.21.1 (rgerhards), 2007-12-23 - small doc fix for $IncludeConfig - fixed a bug in llDestroy() diff --git a/net.h b/net.h index 1164e33f..8eab9196 100644 --- a/net.h +++ b/net.h @@ -71,5 +71,18 @@ static inline size_t SALEN(struct sockaddr *sa) { rsRetVal cvthname(struct sockaddr_storage *f, uchar *pszHost, uchar *pszHostFQDN); +/* IPv6 compatibility layer for older platforms + * We need to handle a few things different if we are running + * on an older platform which does not support all the glory + * of IPv6. We try to limit toll on features and reliability, + * but obviously it is better to run rsyslog on a platform that + * supports everything... + * rgerhards, 2007-06-22 + */ +#ifndef AI_NUMERICSERV +# define AI_NUMERICSERV 0 +#endif + + #endif /* #ifdef SYSLOG_INET */ #endif /* #ifndef INCLUDED_NET_H */ diff --git a/syslogd.c b/syslogd.c index 3c37b991..c562b4ed 100644 --- a/syslogd.c +++ b/syslogd.c @@ -311,19 +311,6 @@ #endif -/* IPv6 compatibility layer for older platforms - * We need to handle a few things different if we are running - * on an older platform which does not support all the glory - * of IPv6. We try to limit toll on features and reliability, - * but obviously it is better to run rsyslog on a platform that - * supports everything... - * rgerhards, 2007-06-22 - */ -#ifndef AI_NUMERICSERV -# define AI_NUMERICSERV 0 -#endif - - static uchar *ConfFile = (uchar*) _PATH_LOGCONF; /* read-only after startup */ static char *PidFile = _PATH_LOGPID; /* read-only after startup */ static uchar *pModDir = NULL; /* read-only after startup */ -- cgit v1.2.3