evolution-data-server r8486 - in trunk: . camel

[mbarnes svn gnome org]

Author: mbarnes
Date: Thu Feb 14 18:11:09 2008
New Revision: 8486
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8486&view=rev

Log:
2008-02-14  Matthew Barnes  <mbarnes redhat com>

	** Fixes bug #516074

	* configure.in:
	* camel/camel-net-utils.c:
	* camel/camel-net-utils.h:
	Don't assume NI_MAXHOST and NI_MAXSERV are defined in <netdb.h>
	since these are GNU extensions.



Modified:
   trunk/ChangeLog
   trunk/camel/ChangeLog
   trunk/camel/camel-net-utils.c
   trunk/camel/camel-net-utils.h
   trunk/configure.in

Modified: trunk/camel/camel-net-utils.c
==============================================================================
--- trunk/camel/camel-net-utils.c	(original)
+++ trunk/camel/camel-net-utils.c	Thu Feb 14 18:11:09 2008
@@ -44,6 +44,14 @@
 
 #define d(x)
 
+/* These are GNU extensions */
+#ifndef NI_MAXHOST
+#define NI_MAXHOST	1025
+#endif
+#ifndef NI_MAXSERV
+#define NI_MAXSERV	32
+#endif
+
 #ifdef G_OS_WIN32
 
 typedef short in_port_t;

Modified: trunk/camel/camel-net-utils.h
==============================================================================
--- trunk/camel/camel-net-utils.h	(original)
+++ trunk/camel/camel-net-utils.h	Thu Feb 14 18:11:09 2008
@@ -77,9 +77,6 @@
 #define EAI_SYSTEM	  -11	/* System error returned in `errno'.  */
 #define EAI_OVERFLOW	  -12	/* Argument buffer overflow.  */
 
-#define NI_MAXHOST      1025
-#define NI_MAXSERV      32
-
 #define NI_NUMERICHOST	1	/* Don't try to look up hostname.  */
 #define NI_NUMERICSERV	2	/* Don't convert port number to name.  */
 #define NI_NOFQDN	4	/* Only return nodename portion.  */

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Feb 14 18:11:09 2008
@@ -878,6 +878,14 @@
 		#include <stddef.h>
 
 	],[
+		#ifndef NI_MAXHOST
+		#define NI_MAXHOST	1025
+		#endif
+
+		#ifndef NI_MAXSERV
+		#define NI_MAXSERV	32
+		#endif
+
 		struct addrinfo hints, *res;
 		struct sockaddr_in6 sin6;
 		int af = AF_INET6;