ldapconfig.h vs ldap_config.h changes

backout previous nt changes (actually, just don't include nt_svc.c)

build/main.dsw

@@ -485,6 +485,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name liblber
+    End Project Dependency
 }}}
 
 ###############################################################################

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
 

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

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];

servers/slapd/nt_debug.c

@@ -7,6 +7,7 @@
 #include <ac/string.h>
 
 #include "slap.h"
+#include "ldap_defaults.h"
 
 static FILE *log_file;
 

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;

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