Wrap externs with parens to protect against inproper macro expansion.

diff --git a/include/ac/alloca.h b/include/ac/alloca.h
index e8bb452fe2b0bc64d2f783738a981d1843357102..4c4fa6ae50f60a7a76e46b2b1f2b57c32a55445d 100644 (file)
--- a/include/ac/alloca.h
+++ b/include/ac/alloca.h
@@ -23,7 +23,7 @@
 #pragma alloca
 #  else
 #   ifndef alloca /* predefined by HP cc +Olibcalls */
-extern char *alloca ();
+extern char *(alloca)();
 #   endif
 #  endif
 # endif

diff --git a/include/ac/errno.h b/include/ac/errno.h
index a60ef0abfbde0135391f08959841525bc8014a67..48fa87da6230eea3c2ecee82615e6918d86bd834 100644 (file)
--- a/include/ac/errno.h
+++ b/include/ac/errno.h
@@ -28,10 +28,6 @@ extern char     *sys_errlist[];
 #endif
 #endif
     
-#if !defined( EWOULDBLOCK ) && defined( WSAEWOULDBLOCK )
-#define EWOULDBLOCK WSAEWOULDBLOCK
-#endif
-
 /* use _POSIX_VERSION for POSIX.1 code */
 
 #endif /* _AC_ERRNO_H */

diff --git a/include/ac/setproctitle.h b/include/ac/setproctitle.h
index f97074e7c2a44ecf4515bb27b922dc8a13e52a19..92be853b3bed3d8b34e6a87a865306d19d6f6cce 100644 (file)
--- a/include/ac/setproctitle.h
+++ b/include/ac/setproctitle.h
@@ -18,7 +18,7 @@
 #      include <libutil.h>
 #else
        /* use lutil version */
-       extern void setproctitle LDAP_P((const char *fmt, ...));
+       extern void (setproctitle) LDAP_P((const char *fmt, ...));
        extern int Argc;
        extern char **Argv;
 #endif

diff --git a/include/ac/socket.h b/include/ac/socket.h
index c49226fcc15e5fe1b6375c11b0da8bed4c43771c..8fd3dce772b12ff84a4b86fb91e42d2a7a1c8611 100644 (file)
--- a/include/ac/socket.h
+++ b/include/ac/socket.h
@@ -67,6 +67,9 @@
 #      define tcp_close( s )           closesocket( s );
 #      define ioctl( s, c, a )         ioctlsocket( (s), (c), (a) )
 #      define ioctl_t                          u_long
+
+#define EWOULDBLOCK WSAEWOULDBLOCK
+
 #elif MACOS
 #      define tcp_close( s )           tcpclose( s )
 #elif DOS

diff --git a/include/ac/string.h b/include/ac/string.h
index 576205c7cf9fc433587ce54f31ee896478034947..2e8472d37f9fe99cadc6d5446357a9fb10addef4 100644 (file)
--- a/include/ac/string.h
+++ b/include/ac/string.h
@@ -57,7 +57,7 @@ extern char *ldap_pvt_strdup( const char * s );
 #else
 #      ifdef DECL_STRDUP
                /* some systems fail to declare strdup */
-               extern char *strdup();
+               extern char *(strdup)();
 #      endif
 #endif
 

diff --git a/include/ac/unistd.h b/include/ac/unistd.h
index 61ad9172b18043a2ee8a7025286901de09b4a5e2..db1e3cb7c9c28361446387d6b4b14ab76913cacd 100644 (file)
--- a/include/ac/unistd.h
+++ b/include/ac/unistd.h
@@ -24,11 +24,11 @@
 #if HAVE_CRYPT_H
 #      include <crypt.h>
 #else
-       extern char *crypt();
+       extern char *(crypt)();
 #endif
 
 #ifndef HAVE_GETPASS
-extern char* getpass LDAP_P((const char *getpass));
+extern char* (getpass) LDAP_P((const char *getpass));
 #endif
 
 /* getopt() defines may be in separate include file */
@@ -46,10 +46,10 @@ extern char* getpass LDAP_P((const char *getpass));
 #endif
 
 #ifndef HAVE_TEMPNAM
-       extern char *tempnam(const char *tmpdir, const char *prefix);
+       extern char *(tempnam)(const char *tmpdir, const char *prefix);
 #endif
 #ifndef HAVE_MKTEMP
-       extern char *mktemp(char *);
+       extern char *(mktemp)(char *);
 #endif
 
 /* use lutil file locking */