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 9d6eed76cf7d6e1e93b8001b41d2998adcbd20c8..2201ffa5b7155e9a0795a9639f78c0ac20504b5d 100644 (file)
--- 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 9c082cd90b2f18f1b8c593cabc2af4f3ce4b02d5..f1f9dae8317e08f59e7891cf644c02ac0ba2d3ab 100644 (file)
--- 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 e16dac581bf542e3df0f0ac6b9ee4fea34efb70a..7f073efee9564da47f81bccf25a88f012574720b 100644 (file)
--- 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 fa7b970d1dd4a814e8c819073178cb96cd544f8a..148bb73afcad7800a1ce05e71e4ddd42ab37bcdb 100644 (file)
--- 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 4c1a916ec51c82dae7210381ae15f9f76b1b55b7..b4a650fc5500b25ecf1c5f4cc124b55948f96da5 100644 (file)
--- 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 a63b58f65b2d78a410e49ea35bd2ef3193cde27c..b4e3bc6905363fb738ce16a6b217684c2938e60e 100644 (file)
--- 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 c7864ba2ae5e993aa092d66ffdaf1e47e51ed44d..463f2da1ee0524c30b673ba293f453b7af56a9f0 100644 (file)
--- 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