From: Mark Valence <mrv@openldap.org>
Date: Mon, 19 Jun 2000 22:40:42 +0000 (+0000)
Subject: Update some prototype macros to build on NT.
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~2563
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=463cc5479f2031c6cabc20b67c40843331d59676;p=openldap

Update some prototype macros to build on NT.
---

diff --git a/include/ac/socket.h b/include/ac/socket.h
index 5b5be9d434..81b4895e8c 100644
--- 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 b14189917e..2d601a317d 100644
--- 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 b065a21db0..93bd6fa92b 100644
--- 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;