Fixed use of LDAP_F macro

See README 1.27 log

diff --git a/libraries/liblber/lber-int.h b/libraries/liblber/lber-int.h
index 8a6cd6b0e9e3aac14c116eca22a52c99f744d982..63f979309a214f87bf6209da135e63d7b3d10838 100644 (file)
--- a/libraries/liblber/lber-int.h
+++ b/libraries/liblber/lber-int.h
@@ -105,8 +105,8 @@ typedef struct sockbuf_io Sockbuf_IO;
 typedef struct sockbuf_sec Sockbuf_Sec;
 typedef struct sockbuf_buf Sockbuf_Buf;
 
-extern Sockbuf_IO ber_pvt_sb_io_tcp;
-extern Sockbuf_IO ber_pvt_sb_io_udp;
+LDAP_F( Sockbuf_IO ) ber_pvt_sb_io_tcp;
+LDAP_F( Sockbuf_IO ) ber_pvt_sb_io_udp;
 
 
 struct sockbuf {
@@ -187,6 +187,15 @@ struct seqorset {
  */
 #define ber_log_printf ber_pvt_log_printf
 
+#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( int )
 ber_log_bprint LDAP_P((
        int errlvl,

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index 155213471bcbbe0971ecf1a38c6dd1ba53a46152..2957420a9a2107875abae025699099866a8d1f6d 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -271,7 +271,7 @@ struct ldap {
  * in init.c
  */
 
-extern struct ldapoptions ldap_int_global_options;
+LDAP_F ( struct ldapoptions ) ldap_int_global_options;
 void ldap_int_initialize LDAP_P((void));