From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 17 Jun 1999 04:43:24 +0000 (+0000)
Subject: ldapconfig.h vs ldap_config.h changes
X-Git-Tag: OPENLDAP_REL_ENG_2_BP~284
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bbc568b21fbf64e1eb16ed4914060b9c2044bcef;p=openldap

ldapconfig.h vs ldap_config.h changes
backout previous nt changes (actually, just don't include nt_svc.c)
---

diff --git a/build/main.dsw b/build/main.dsw
index 9d6eed76cf..2201ffa5b7 100644
--- a/build/main.dsw
+++ b/build/main.dsw
@@ -485,6 +485,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name liblber
+    End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/include/ldap_schema.h b/include/ldap_schema.h
index 9c082cd90b..f1f9dae831 100644
--- a/include/ldap_schema.h
+++ b/include/ldap_schema.h
@@ -144,7 +144,7 @@ ldap_matchingrule2str LDAP_P((
 
 LDAP_F( char *)
 ldap_scherr2str LDAP_P((
-	LDAP_CONST int code ));
+	int code ));
 
 LDAP_END_DECL
 
diff --git a/libraries/libldap/libldap.dsp b/libraries/libldap/libldap.dsp
index e16dac581b..7f073efee9 100644
--- a/libraries/libldap/libldap.dsp
+++ b/libraries/libldap/libldap.dsp
@@ -235,6 +235,14 @@ SOURCE=..\..\include\ldap_cdefs.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\ldap_config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\ldap_defaults.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\ldap_features.h
 # End Source File
 # Begin Source File
@@ -251,10 +259,6 @@ SOURCE=..\..\include\ldap_schema.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\ldapconfig.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\messages.c
 # End Source File
 # Begin Source File
diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index fa7b970d1d..148bb73afc 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -534,7 +534,7 @@ slapd_daemon_task(
 		for ( i = 0; i < nfds; i++ )
 #endif
 		{
-			int wd, active;
+			int wd;
 
 #ifdef HAVE_WINSOCK
 			wd = writefds.fd_array[i];
@@ -572,7 +572,7 @@ slapd_daemon_task(
 		for ( i = 0; i < nfds; i++ )
 #endif
 		{
-			int rd, active;
+			int rd;
 
 #ifdef HAVE_WINSOCK
 			rd = readfds.fd_array[i];
diff --git a/servers/slapd/nt_debug.c b/servers/slapd/nt_debug.c
index 4c1a916ec5..b4a650fc55 100644
--- a/servers/slapd/nt_debug.c
+++ b/servers/slapd/nt_debug.c
@@ -7,6 +7,7 @@
 #include <ac/string.h>
 
 #include "slap.h"
+#include "ldap_defaults.h"
 
 static FILE *log_file;
 
diff --git a/servers/slapd/nt_svc.c b/servers/slapd/nt_svc.c
index a63b58f65b..b4e3bc6905 100644
--- a/servers/slapd/nt_svc.c
+++ b/servers/slapd/nt_svc.c
@@ -14,7 +14,8 @@
 #include "ldap_defaults.h"
 #include "slap.h"
 
-#include "slapdmsg.h"
+/* kludge a path for now */
+#include "../../libraries/liblutil/slapdmsg.h"
 
 #define SCM_NOTIFICATION_INTERVAL	5000
 #define THIRTY_SECONDS				(30 * 1000)
@@ -39,7 +40,7 @@ char *GetLastErrorString( void );
 int srv_install( char* service, char* filename );
 int srv_remove ( char* service, char* filename );
 
-void main( DWORD argc, LPTSTR *argv )
+void nt_main( DWORD argc, LPTSTR *argv )
 {
 	int		length;
 	char	filename[MAX_PATH], *fname_start;
diff --git a/servers/slapd/slapd.dsp b/servers/slapd/slapd.dsp
index c7864ba2ae..463f2da1ee 100644
--- a/servers/slapd/slapd.dsp
+++ b/servers/slapd/slapd.dsp
@@ -77,7 +77,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 hs_regexd.lib libdb.lib wsock32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 hs_regex.lib libdb.lib wsock32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 
 !ELSEIF  "$(CFG)" == "slapd - Win32 Single Debug"
 
@@ -147,10 +147,6 @@ SOURCE=.\main.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\nt_svc.c
-# End Source File
-# Begin Source File
-
 SOURCE=".\proto-slap.h"
 # End Source File
 # Begin Source File