Module Name: src
Committed By: joerg
Date: Tue Nov 8 22:21:30 UTC 2011
Modified Files:
src/external/ibm-public/postfix/dist/src/util: sys_defs.h
Log Message:
Just because IPV6 support is disabled doesn't mean inet_ntop are not
present. Since the local prototype conflicts, use the system version.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r1.2 \
src/external/ibm-public/postfix/dist/src/util/sys_defs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/ibm-public/postfix/dist/src/util/sys_defs.h
diff -u src/external/ibm-public/postfix/dist/src/util/sys_defs.h:1.1.1.6 src/external/ibm-public/postfix/dist/src/util/sys_defs.h:1.2
--- src/external/ibm-public/postfix/dist/src/util/sys_defs.h:1.1.1.6 Sun Jul 31 10:03:06 2011
+++ src/external/ibm-public/postfix/dist/src/util/sys_defs.h Tue Nov 8 22:21:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_defs.h,v 1.1.1.6 2011/07/31 10:03:06 tron Exp $ */
+/* $NetBSD: sys_defs.h,v 1.2 2011/11/08 22:21:30 joerg Exp $ */
#ifndef _SYS_DEFS_H_INCLUDED_
#define _SYS_DEFS_H_INCLUDED_
@@ -1275,6 +1275,7 @@ extern int dup2_pass_on_exec(int oldd, i
/*
* Defaults for systems that pre-date IPv6 support.
*/
+#ifndef __NetBSD__
#ifndef HAS_IPV6
#define EMULATE_IPV4_ADDRINFO
#define MISSING_INET_PTON
@@ -1283,6 +1284,7 @@ extern const char *inet_ntop(int, const
extern int inet_pton(int, const char *, void *);
#endif
+#endif
/*
* Workaround: after a watchdog alarm signal, wake up from select/poll/etc.
