From 5438e045af395c25595f2c0535f504e28b696c88 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 28 Oct 1999 07:29:25 +0000 Subject: [PATCH] Fixed use of LDAP_F macro See README 1.27 log --- libraries/liblber/lber-int.h | 13 +++++++++++-- libraries/libldap/ldap-int.h | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/libraries/liblber/lber-int.h b/libraries/liblber/lber-int.h index 8a6cd6b0e9..63f979309a 100644 --- 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 155213471b..2957420a9a 100644 --- 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)); -- 2.39.5