[svn] GnuPG - r5380 - trunk/dirmngr

[svn author wk]

Author: wk
Date: 2010-08-03 16:06:42 +0200 (Tue, 03 Aug 2010)
New Revision: 5380

Modified:
   trunk/dirmngr/ChangeLog
   trunk/dirmngr/dirmngr_ldap.c
Log:
Fix regressions on POSIX
-This line, and those below, will be ignored--

M    dirmngr/dirmngr_ldap.c
M    dirmngr/ChangeLog


Modified: trunk/dirmngr/ChangeLog
===================================================================
--- trunk/dirmngr/ChangeLog	2010-08-02 18:54:53 UTC (rev 5379)
+++ trunk/dirmngr/ChangeLog	2010-08-03 14:06:42 UTC (rev 5380)
@@ -1,3 +1,8 @@
+2010-08-03  Werner Koch  <wk at g10code.com>
+
+	* dirmngr_ldap.c (pth_enter, pth_leave) [USE_LDAPWRAPPER]: Turn
+	into functions for use in a 'for' control stmt.
+
 2010-07-26  Werner Koch  <wk at g10code.com>
 
 	* dirmngr_ldap.c (print_ldap_entries): Remove special fwrite case

Modified: trunk/dirmngr/dirmngr_ldap.c
===================================================================
--- trunk/dirmngr/dirmngr_ldap.c	2010-08-02 18:54:53 UTC (rev 5379)
+++ trunk/dirmngr/dirmngr_ldap.c	2010-08-03 14:06:42 UTC (rev 5380)
@@ -63,8 +63,8 @@
    ldap wrapper process we need to include the prototype for our
    module's main function.  */
 #ifdef USE_LDAPWRAPPER
-# define pth_enter() do { } while (0)
-# define pth_leave() do { } while (0)
+static void pth_enter (void) { }
+static void pth_leave (void) { }
 #else
 # include "./ldap-wrapper.h"
 #endif
@@ -153,7 +153,7 @@
 
 
 /* Function called by argparse.c to display information.  */
-#ifndef USE_LDAPWRAPPER
+#ifdef USE_LDAPWRAPPER
 static const char *
 my_strusage (int level)
 {