diff options
| author | Werner Koch <[email protected]> | 2010-08-03 14:06:42 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2010-08-03 14:06:42 +0000 |
| commit | 459fc7faf622929cfaca42021cf385cad2dc48cd (patch) | |
| tree | 68542e5688620fc0c74972e166820ebb96eb7d10 | |
| parent | Add code for a threaded LDAP access to replace the wrapper process. (diff) | |
| download | gnupg-459fc7faf622929cfaca42021cf385cad2dc48cd.tar.gz gnupg-459fc7faf622929cfaca42021cf385cad2dc48cd.zip | |
Fix regressions on POSIX
-This line, and those below, will be ignored--
M dirmngr/dirmngr_ldap.c
M dirmngr/ChangeLog
Diffstat (limited to '')
| -rw-r--r-- | dirmngr/ChangeLog | 5 | ||||
| -rw-r--r-- | dirmngr/dirmngr_ldap.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/dirmngr/ChangeLog b/dirmngr/ChangeLog index 9ceafe3f7..57cc1c772 100644 --- a/dirmngr/ChangeLog +++ b/dirmngr/ChangeLog @@ -1,3 +1,8 @@ +2010-08-03 Werner Koch <[email protected]> + + * dirmngr_ldap.c (pth_enter, pth_leave) [USE_LDAPWRAPPER]: Turn + into functions for use in a 'for' control stmt. + 2010-07-26 Werner Koch <[email protected]> * dirmngr_ldap.c (print_ldap_entries): Remove special fwrite case diff --git a/dirmngr/dirmngr_ldap.c b/dirmngr/dirmngr_ldap.c index f257507be..bdee19933 100644 --- a/dirmngr/dirmngr_ldap.c +++ b/dirmngr/dirmngr_ldap.c @@ -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 @@ static int process_url (my_opt_t myopt, const char *url); /* Function called by argparse.c to display information. */ -#ifndef USE_LDAPWRAPPER +#ifdef USE_LDAPWRAPPER static const char * my_strusage (int level) { |