[gentoo-commits] gentoo-x86 commit in net-nds/openldap/files: openldap-2.3.XY-gcc44.patch

[gentoo-commits] gentoo-x86 commit in net-nds/openldap/files: openldap-2.3.XY-gcc44.patch

[Peter Alfredsen (loki_val)]

loki_val    09/05/08 01:16:29

  Added:                openldap-2.3.XY-gcc44.patch
  Log:
  Fix build with gcc-4.4, bug 264761. Thanks to Daniel J. <sleeperseven@hotmail.com> for the patch. Versions still affected: openldap-2.4.7, 2.4.10, 2.4.11*, but PMASKED. Use 2.4.16 if you have to.
  (Portage version: 2.2_rc28/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-nds/openldap/files/openldap-2.3.XY-gcc44.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/openldap/files/openldap-2.3.XY-gcc44.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nds/openldap/files/openldap-2.3.XY-gcc44.patch?rev=1.1&content-type=text/plain

Index: openldap-2.3.XY-gcc44.patch
===================================================================
--- include/ldap_pvt_thread.h	2009-04-03 08:51:30.000000000 -0400
+++ include/ldap_pvt_thread.h	2009-04-03 08:56:36.000000000 -0400
@@ -57,12 +57,12 @@
 
 #ifndef LDAP_PVT_THREAD_H_DONE
 #define	LDAP_PVT_THREAD_SET_STACK_SIZE
-#ifndef LDAP_PVT_THREAD_STACK_SIZE
-	/* LARGE stack. Will be twice as large on 64 bit machine. */
-#define LDAP_PVT_THREAD_STACK_SIZE	( 1 * 1024 * 1024 * sizeof(void *) )
 /* May be explicitly defined to zero to disable it */
-#elif LDAP_PVT_THREAD_STACK_SIZE == 0
+#if defined( LDAP_PVT_THREAD_STACK_SIZE ) && LDAP_PVT_THREAD_STACK_SIZE == 0
 #undef LDAP_PVT_THREAD_SET_STACK_SIZE
+#elif !defined(LDAP_PVT_THREAD_STACK_SIZE)
+	/* LARGE stack. Will be twice as large on 64 bit machine. */
+#define LDAP_PVT_THREAD_STACK_SIZE	( 1 * 1024 * 1024 * sizeof(void *) )
 #endif
 #endif /* !LDAP_PVT_THREAD_H_DONE */
 
--- libraries/libldap/os-ip.c	2009-04-03 08:51:30.000000000 -0400
+++ libraries/libldap/os-ip.c	2009-04-03 08:54:47.000000000 -0400
@@ -652,7 +652,7 @@
 		char *herr;
 #ifdef NI_MAXHOST
 		char hbuf[NI_MAXHOST];
-#elif defined( MAXHOSTNAMELEN
+#elif defined( MAXHOSTNAMELEN )
 		char hbuf[MAXHOSTNAMELEN];
 #else
 		char hbuf[256];