Fixed the LDAP_F macro.

See README 1.27 log

diff --git a/include/ac/assert.h b/include/ac/assert.h
index 6c3a44ed77639592160cbcba9b31de29ec738482..42282ad21c4c37c4003e1dc99f7cf1260b493fe6 100644 (file)
--- a/include/ac/assert.h
+++ b/include/ac/assert.h
@@ -31,6 +31,15 @@
  * create a replacement and hope it works
  */
 
+#ifdef __MINGW32__
+#   undef LDAP_F_PRE
+#   ifdef LIBLBER_DECL
+#      define LDAP_F_PRE       extern __declspec(LIBLBER_DECL)
+#   else
+#      define LDAP_F_PRE       extern
+#   endif
+#endif
+
 LDAP_F(void) ber_pvt_assert LDAP_P((
        const char *file, int line, const char *test ));
 

diff --git a/include/ac/setproctitle.h b/include/ac/setproctitle.h
index 5bf1d2f49634a3ac13a43816d58f5eadef73426f..62eda796de8f165f1b35e675fcc72289a95ef881 100644 (file)
--- a/include/ac/setproctitle.h
+++ b/include/ac/setproctitle.h
@@ -18,6 +18,15 @@
 #if defined( HAVE_LIBUTIL_H )
 #      include <libutil.h>
 #else
+
+#ifdef __MINGW32__
+#   undef LDAP_F_PRE
+#   ifdef LIBLUTIL_DECL
+#      define LDAP_F_PRE       extern __declspec(LIBLUTIL_DECL)
+#   else
+#      define LDAP_F_PRE       extern
+#   endif
+#endif
        /* use lutil version */
        LDAP_F(void) (setproctitle) LDAP_P((const char *fmt, ...)) \
                                    LDAP_GCCATTR((format(printf, 1, 2)));

diff --git a/include/ac/socket.h b/include/ac/socket.h
index fc1d533b6f6365bf62c7138e6d61c2748934e6ca..1d9d1840f365845d97c8b442f4e1c3e8e3a9b1ba 100644 (file)
--- a/include/ac/socket.h
+++ b/include/ac/socket.h
@@ -139,7 +139,7 @@ extern char* WSAGetErrorString LDAP_P((int));
 #if !defined( HAVE_INET_ATON ) && !defined( inet_aton )
 #define inet_aton ldap_pvt_inet_aton
 struct in_addr;
-int ldap_pvt_inet_aton LDAP_P(( const char *, struct in_addr * ));
+LDAP_F( int ) ldap_pvt_inet_aton LDAP_P(( const char *, struct in_addr * ));
 #endif
 
 #if    defined(__WIN32) && defined(_ALPHA)

diff --git a/include/ac/string.h b/include/ac/string.h
index 980511d3d0d5b63ac15190d0ac090ae7ae5f360c..bc884ae81b3952dc79e128cdeb99bcebdfb734d1 100644 (file)
--- a/include/ac/string.h
+++ b/include/ac/string.h
@@ -42,6 +42,15 @@
 #      endif
 #endif
 
+#ifdef __MINGW32__
+#   undef LDAP_F_PRE
+#   ifdef LIBLDAP_DECL
+#      define LDAP_F_PRE       extern __declspec(LIBLDAP_DECL)
+#   else
+#      define LDAP_F_PRE       extern
+#   endif
+#endif
+
 /* use ldap_pvt_strtok instead of strtok or strtok_r! */
 LDAP_F(char *) ldap_pvt_strtok LDAP_P((
        char *str, const char *delim, char **pos ));

diff --git a/include/ac/unistd.h b/include/ac/unistd.h
index 32734777e4d1efc9f07b28a87c28b600d2781478..d62d3b86bde7dc8331091c13d7efc67d80001a30 100644 (file)
--- a/include/ac/unistd.h
+++ b/include/ac/unistd.h
@@ -23,6 +23,15 @@
 
 /* note: callers of crypt(3) should include <ac/crypt.h> */
 
+#ifdef __MINGW32__
+#   undef LDAP_F_PRE
+#   ifdef LIBLUTIL_DECL
+#      define LDAP_F_PRE       extern __declspec(LIBLUTIL_DECL)
+#   else
+#      define LDAP_F_PRE       extern
+#   endif
+#endif
+
 #ifndef HAVE_GETPASS
 LDAP_F(char*)(getpass) LDAP_P((const char *getpass));
 #else
@@ -48,9 +57,13 @@ LDAP_F(char*)(getpass)();
                const char *tmpdir,
                const char *prefix));
 #endif
+
+/* This is never even checked for or implemented if not present */
+#if 0
 #ifndef HAVE_MKTEMP
        LDAP_F(char *)(mktemp) LDAP_P((char *));
 #endif
+#endif
 
 /* use lutil file locking */
 #define ldap_lockf(x)  lutil_lockf(x)

diff --git a/include/avl.h b/include/avl.h
index ae3b44ab65f2da2656bf0d193c8fff89a2682d3b..deb79950c3402408e30f0fbc8442825964621d64 100644 (file)
--- a/include/avl.h
+++ b/include/avl.h
@@ -61,6 +61,15 @@ typedef int          (*AVL_CMP) LDAP_P((const void*, const void*));
 typedef int            (*AVL_DUP) LDAP_P((void*, void*));
 typedef void   (*AVL_FREE) LDAP_P((void*));
 
+#ifdef __MINGW32__
+#   undef LDAP_F_PRE
+#   ifdef LIBAVL_DECL
+#      define LDAP_F_PRE       extern __declspec(LIBAVL_DECL)
+#   else
+#      define LDAP_F_PRE       extern
+#   endif
+#endif
+
 LDAP_F( int )
 avl_free LDAP_P(( Avlnode *root, AVL_FREE dfree ));
 

diff --git a/include/disptmpl.h b/include/disptmpl.h
index ba6f4bd98258bd8c761c26c213be256eb041ae73..cf2f2865a47dfbbfba35600ed3430556fbdbd3ec 100644 (file)
--- a/include/disptmpl.h
+++ b/include/disptmpl.h
@@ -225,6 +225,15 @@ struct ldap_disptmpl {
 typedef int (*ldap_writeptype) LDAP_P((
        void *writeparm, char *p, ber_len_t len ));
 
+#ifdef __MINGW32__
+#   undef LDAP_F_PRE
+#   ifdef LIBLDAP_DECL
+#      define LDAP_F_PRE       extern __declspec(LIBLDAP_DECL)
+#   else
+#      define LDAP_F_PRE       extern
+#   endif
+#endif
+
 LDAP_F( int )
 ldap_init_templates LDAP_P(( char *file, struct ldap_disptmpl **tmpllistp ));
 

diff --git a/include/getopt-compat.h b/include/getopt-compat.h
index 14b2a2f5b028c8b077c68f23f5abad3129d106db..24fbbb5a87836c417accd99cb06ad663663be030 100644 (file)
--- a/include/getopt-compat.h
+++ b/include/getopt-compat.h
@@ -21,6 +21,15 @@ LDAP_BEGIN_DECL
 extern char *optarg;
 extern int optind, opterr, optopt;
 
+#ifdef __MINGW32__
+#   undef LDAP_F_PRE
+#   ifdef LIBLUTIL_DECL
+#      define LDAP_F_PRE       extern __declspec(LIBLUTIL_DECL)
+#   else
+#      define LDAP_F_PRE       extern
+#   endif
+#endif
+
 LDAP_F( int )
 getopt LDAP_P((
        int,

diff --git a/include/lber.h b/include/lber.h
index 56eaa24e55a1ec8dde8f9e9c873aa690dea35c53..240925517a4d75a6047cead28acf18101288e2fd 100644 (file)
--- a/include/lber.h
+++ b/include/lber.h
@@ -163,6 +163,15 @@ typedef struct berval {
        char            *bv_val;
 } BerValue;
 
+#ifdef __MINGW32__
+#   undef LDAP_F_PRE
+#   ifdef LIBLBER_DECL
+#      define LDAP_F_PRE       extern __declspec(LIBLBER_DECL)
+#   else
+#      define LDAP_F_PRE       extern
+#   endif
+#endif
+
 /*
  * in bprint.c:
  */

diff --git a/include/lber_pvt.h b/include/lber_pvt.h
index 7e26591ceab2ff34c16fe90078d6d2a10c96806f..c407f4eab0a6a929d178161921c65b07cf490740 100644 (file)
--- a/include/lber_pvt.h
+++ b/include/lber_pvt.h
@@ -20,6 +20,15 @@
 
 LDAP_BEGIN_DECL
 
+#ifdef __MINGW32__
+#   undef LDAP_F_PRE
+#   ifdef LIBLBER_DECL
+#      define LDAP_F_PRE       extern __declspec(LIBLBER_DECL)
+#   else
+#      define LDAP_F_PRE       extern
+#   endif
+#endif
+
 /*
  * bprint.c
  */

diff --git a/include/ldap.h b/include/ldap.h
index ff3a22a2c5e2f0e12ca7fa02b3819c66f645dc23..cda3ad767af4023db749a2fb6139cb895dedc09c 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -504,6 +504,15 @@ typedef struct ldap_url_desc {
  */
 struct timeval;
 
+#ifdef __MINGW32__
+#   undef LDAP_F_PRE
+#   ifdef LIBLDAP_DECL
+#      define LDAP_F_PRE       extern __declspec(LIBLDAP_DECL)
+#   else
+#      define LDAP_F_PRE       extern
+#   endif
+#endif
+
 /*
  * in options.c:
  */

diff --git a/include/ldap_log.h b/include/ldap_log.h
index dfb2e7a9cdc78d171a87805eed297686644f8836..ac0f4c3a2b802dcba4dace8e0bb612a382a67469 100644 (file)
--- a/include/ldap_log.h
+++ b/include/ldap_log.h
@@ -74,6 +74,15 @@ extern int   ldap_syslog_level;
 #define Debug( level, fmt, arg1, arg2, arg3 )
 #endif /* LDAP_DEBUG */
 
+#ifdef __MINGW32__
+#   undef LDAP_F_PRE
+#   ifdef LIBLUTIL_DECL
+#      define LDAP_F_PRE       extern __declspec(LIBLUTIL_DECL)
+#   else
+#      define LDAP_F_PRE       extern
+#   endif
+#endif
+
 LDAP_F(void) lutil_debug LDAP_P((
        int debug, int level,
        const char* fmt, ... )) LDAP_GCCATTR((format(printf, 3, 4)));

diff --git a/include/ldap_pvt.h b/include/ldap_pvt.h
index 2b20ed49298e7e524d89ed76cd2ef7c784d18c17..f20b7ebfcbf527795cfd2cd390ae27fd92e4de68 100644 (file)
--- a/include/ldap_pvt.h
+++ b/include/ldap_pvt.h
@@ -23,6 +23,15 @@ LDAP_BEGIN_DECL
 
 struct hostent;        /* avoid pulling in <netdb.h> */
 
+#ifdef __MINGW32__
+#   undef LDAP_F_PRE
+#   ifdef LIBLDAP_DECL
+#      define LDAP_F_PRE       extern __declspec(LIBLDAP_DECL)
+#   else
+#      define LDAP_F_PRE       extern
+#   endif
+#endif
+
 LDAP_F( char * )
 ldap_pvt_ctime LDAP_P((
        const time_t *tp,

diff --git a/include/ldap_pvt_thread.h b/include/ldap_pvt_thread.h
index a006a2ef6637d24e5ea83c0630bef17a956fdfcb..2861681bad2a06ed9bb6612aeab3c2fc48598d7d 100644 (file)
--- a/include/ldap_pvt_thread.h
+++ b/include/ldap_pvt_thread.h
@@ -137,7 +137,8 @@ typedef struct ldap_pvt_thread_lwp_cv ldap_pvt_thread_cond_t;
 
 LDAP_END_DECL
 
-#elif HAVE_NT_THREADS
+/* If we're in the NT env at all, we want these defs, threaded or not */
+#elif defined(WINNT) || defined(_WINNT) /* HAVE_NT_THREADS */
 
 LDAP_BEGIN_DECL
 
@@ -176,6 +177,15 @@ LDAP_END_DECL
 
 LDAP_BEGIN_DECL
 
+#ifdef __MINGW32__
+#   undef LDAP_F_PRE
+#   ifdef LIBLDAP_DECL
+#      define LDAP_F_PRE       extern __declspec(LIBLDAP_DECL)
+#   else
+#      define LDAP_F_PRE       extern
+#   endif
+#endif
+
 LDAP_F( int )
 ldap_pvt_thread_initialize LDAP_P(( void ));
 

diff --git a/include/ldap_schema.h b/include/ldap_schema.h
index c0c21bc88da4628f8368c64f783ea7c3be551b92..1fdb9e952e8e9968e22e6471ef128ff89f4d567f 100644 (file)
--- a/include/ldap_schema.h
+++ b/include/ldap_schema.h
@@ -87,6 +87,15 @@ typedef struct ldap_objectclass {
 #define LDAP_SCHEMA_STRUCTURAL                 1
 #define LDAP_SCHEMA_AUXILIARY                  2
 
+#ifdef __MINGW32__
+#   undef LDAP_F_PRE
+#   ifdef LIBLDAP_DECL
+#      define LDAP_F_PRE       extern __declspec(LIBLDAP_DECL)
+#   else
+#      define LDAP_F_PRE       extern
+#   endif
+#endif
+
 LDAP_F( LDAP_CONST char * )
 ldap_syntax2name LDAP_P((
        LDAP_SYNTAX * syn ));

diff --git a/include/ldif.h b/include/ldif.h
index a50bbf063442a73d8dde65ac32455a0d881fd2f0..caba0b613e03a7e85529e96e8432bfa73fe443f5 100644 (file)
--- a/include/ldif.h
+++ b/include/ldif.h
@@ -48,6 +48,15 @@ extern int ldif_debug;
     ((nlen) + 4 + LDIF_BASE64_LEN(vlen) \
     + ((LDIF_BASE64_LEN(vlen) + (nlen) + 3) / LDIF_LINE_WIDTH * 2 ))
 
+#ifdef __MINGW32__
+#   undef LDAP_F_PRE
+#   ifdef LIBLDIF_DECL
+#      define LDAP_F_PRE       extern __declspec(LIBLDIF_DECL)
+#   else
+#      define LDAP_F_PRE       extern
+#   endif
+#endif
+
 LDAP_F( int )
 ldif_parse_line LDAP_P((
        LDAP_CONST char *line,

diff --git a/include/lutil.h b/include/lutil.h
index 152c1316fdcd9fe317c315af22424fc6dfe8f84f..39e7d70f2bfd6c3f9c31c08f210ac2080d336657 100644 (file)
--- a/include/lutil.h
+++ b/include/lutil.h
@@ -19,14 +19,23 @@
  * Include file for LDAP utility routine
  */
 
+LDAP_BEGIN_DECL
+
+#ifdef __MINGW32__
+#   undef LDAP_F_PRE
+#   ifdef LIBLUTIL_DECL
+#      define LDAP_F_PRE       extern __declspec(LIBLUTIL_DECL)
+#   else
+#      define LDAP_F_PRE       extern
+#   endif
+#endif
+
 /* n octets encode into ceiling(n/3) * 4 bytes */
 /* Avoid floating point math by through extra padding */
 
 #define LUTIL_BASE64_ENCODE_LEN(n)     ((n)/3 * 4 + 4)
 #define LUTIL_BASE64_DECODE_LEN(n)     ((n)/4 * 3)
 
-LDAP_BEGIN_DECL
-
 /* ISC Base64 Routines */
 /* base64.c */
 

diff --git a/include/lutil_lockf.h b/include/lutil_lockf.h
index 728b445cbffc5a6de64142f82db66d4350a8a8a0..ec9f0e6e046a05f669768e62bf29491c324cf074 100644 (file)
--- a/include/lutil_lockf.h
+++ b/include/lutil_lockf.h
@@ -19,6 +19,15 @@
 
 LDAP_BEGIN_DECL
 
+#ifdef __MINGW32__
+#   undef LDAP_F_PRE
+#   ifdef LIBLUTIL_DECL
+#      define LDAP_F_PRE       extern __declspec(LIBLUTIL_DECL)
+#   else
+#      define LDAP_F_PRE       extern
+#   endif
+#endif
+
 LDAP_F( int )
 lutil_lockf LDAP_P(( int fd ));
 

diff --git a/include/lutil_md5.h b/include/lutil_md5.h
index 6a140c9753558bda521cb3a6da5fc6b4f41df6ae..1d06b74c82d8816fd2224ff33ea006c6a440781d 100644 (file)
--- a/include/lutil_md5.h
+++ b/include/lutil_md5.h
@@ -36,6 +36,15 @@ struct lutil_MD5Context {
        unsigned char in[64];
 };
 
+#ifdef __MINGW32__
+#   undef LDAP_F_PRE
+#   ifdef LIBLUTIL_DECL
+#      define LDAP_F_PRE       extern __declspec(LIBLUTIL_DECL)
+#   else
+#      define LDAP_F_PRE       extern
+#   endif
+#endif
+
 LDAP_F( void )
 lutil_MD5Init LDAP_P((
        struct lutil_MD5Context *context));

diff --git a/include/lutil_sha1.h b/include/lutil_sha1.h
index 07f82fb8eb0af06d8e8dd78b38e5cdaea47d1d71..1f335065a0b75b060ba98a7dd9f7437680030645 100644 (file)
--- a/include/lutil_sha1.h
+++ b/include/lutil_sha1.h
@@ -36,6 +36,15 @@ typedef struct {
     unsigned char buffer[64];
 } lutil_SHA1_CTX;
   
+#ifdef __MINGW32__
+#   undef LDAP_F_PRE
+#   ifdef LIBLUTIL_DECL
+#      define LDAP_F_PRE       extern __declspec(LIBLUTIL_DECL)
+#   else
+#      define LDAP_F_PRE       extern
+#   endif
+#endif
+
 LDAP_F( void )
 lutil_SHA1Transform
        LDAP_P((uint32 state[5], const unsigned char buffer[64]));

diff --git a/include/srchpref.h b/include/srchpref.h
index e3523b005175e6379329c9360cc55f80e419f42d..3f1ae6d581a50579026c789b84b21891bc3d60d0 100644 (file)
--- a/include/srchpref.h
+++ b/include/srchpref.h
@@ -78,6 +78,15 @@ struct ldap_searchobj {
 #define LDAP_SEARCHPREF_ERR_FILE       4
 
 
+#ifdef __MINGW32__
+#   undef LDAP_F_PRE
+#   ifdef LIBLDAP_DECL
+#      define LDAP_F_PRE       extern __declspec(LIBLDAP_DECL)
+#   else
+#      define LDAP_F_PRE       extern
+#   endif
+#endif
+
 LDAP_F( int )
 ldap_init_searchprefs LDAP_P(( char *file,
        struct ldap_searchobj **solistp ));