Use LDAP_F/LDAP_P macros on library externs.

Fix install of ldap_schema.h to use $(srcdir)

diff --git a/include/Makefile.in b/include/Makefile.in
index 23be05f6b0806e437683e5c4c586f2c548f7f660..9d02a3acbdb33caac101213695bd8f2e1f83d733 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -10,10 +10,10 @@ install-local: FORCE
                $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/ldap.h $(includedir)
                $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/lber.h $(includedir)
                $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/ldap_cdefs.h $(includedir)
+               $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/ldap_schema.h $(includedir)
                $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/disptmpl.h $(includedir)
                $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/srchpref.h $(includedir)
                $(INSTALL) $(INSTALLFLAGS) -m 644 ldap_features.h $(includedir)
-               $(INSTALL) $(INSTALLFLAGS) -m 644 ldap_schema.h $(includedir)
 
 clean-local: FORCE 
        $(RM) ldapconfig.h

diff --git a/include/lber_pvt.h b/include/lber_pvt.h
index c083d9fee7d4985e2fd264d8cc04e28bb2ad9763..471aa5b685fe5a7f5b2de1edf90f698a85575cf7 100644 (file)
--- a/include/lber_pvt.h
+++ b/include/lber_pvt.h
@@ -22,7 +22,7 @@ LDAP_BEGIN_DECL
 /*
  * bprint.c
  */
-extern BER_LOG_PRINT_FN ber_pvt_log_print;
+LDAP_F( BER_LOG_PRINT_FN ) ber_pvt_log_print;
 
 LDAP_F( int )
 ber_pvt_log_printf LDAP_P((

diff --git a/include/ldap_log.h b/include/ldap_log.h
index 0714e952e59edbdb8564c6d5fb982c5383cad210..0115024d40c9359e0e393ce1fdd803d59142f527 100644 (file)
--- a/include/ldap_log.h
+++ b/include/ldap_log.h
@@ -72,7 +72,7 @@ extern int    ldap_syslog_level;
                        fprintf( stderr, (fmt), (arg1), (arg2), (arg3) ); \
        } while ( 0 )
 #else /* !WINSOCK */
-extern void Debug( int level, const char* fmt, ... );
+LDAP_F(void) Debug LDAP_P(( int level, const char* fmt, ... ));
 #endif /* !WINSOCK */
 #endif /* LDAP_SYSLOG */
 #else /* LDAP_DEBUG */