Update some prototype macros to build on NT.

diff --git a/include/ac/socket.h b/include/ac/socket.h
index 5b5be9d434fdb9de74c35c84b138bb5c6d134a6a..81b4895e8cb5b7b2a67134a04bc95b5163e2f34a 100644 (file)
--- a/include/ac/socket.h
+++ b/include/ac/socket.h
@@ -92,7 +92,7 @@
 #define        sock_errno()    WSAGetLastError()
 #define        sock_errstr(e)  ber_pvt_wsa_err2string(e)
 
-LIBLBER_F (char *) ber_pvt_wsa_err2string LDAP_P((int));
+LBER_F( char * ) ber_pvt_wsa_err2string LDAP_P((int));
 
 #elif MACOS
 #      define tcp_close( s )           tcpclose( s )

diff --git a/include/ac/unistd.h b/include/ac/unistd.h
index b14189917e597ee11331ba4b1a1f3a74d43c8ac7..2d601a317dd6b6efc669110997347a0be196c60e 100644 (file)
--- a/include/ac/unistd.h
+++ b/include/ac/unistd.h
@@ -37,7 +37,7 @@ LDAP_LIBC_F(char*)(getpass)();
 #else
 #define NEED_GETPASSPHRASE 1
 #define getpassphrase(p) lutil_getpass(p)
-LIBLUTIL_F(char*)(lutil_getpass) LDAP_P((const char *getpass));
+LDAP_LUTIL_F(char*)(lutil_getpass) LDAP_P((const char *getpass));
 #endif
 
 /* getopt() defines may be in separate include file */

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index b065a21db026523046f21d4fb3616cf67ffadeb6..93bd6fa92b09e0323a92e636d20acf6662b37d33 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -28,8 +28,8 @@ static RETSIGTYPE wait4child( int sig );
 struct sockaddr_in     bind_addr;
 
 /* in nt_main.c */
-LIBLUTIL_F (SERVICE_STATUS)            SLAPDServiceStatus;
-LIBLUTIL_F (SERVICE_STATUS_HANDLE)     hSLAPDServiceStatus;
+LDAP_LUTIL_F(SERVICE_STATUS)           SLAPDServiceStatus;
+LDAP_LUTIL_F(SERVICE_STATUS_HANDLE)    hSLAPDServiceStatus;
 extern ldap_pvt_thread_cond_t  started_event,          stopped_event;
 extern int       is_NT_Service;