From dda1fb4ba0f2a885584bc43214b4755b70597a60 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Thu, 1 Apr 1999 20:26:09 +0000 Subject: [PATCH] Updates for NT4 (MSVC5++). Removed external include/library paths from projects. External paths should be set via Tools | Options | Directories. This allows each developer the freedom to install external libraries where they desire. Used libdb.lib instead of libdbs.lib to avoid thread conflicts. Added hs_regex.lib to library input. We require some form of regex, this library works (and is relatively easy for the user to install). Removed a little lint which MCVC5 detected. Need to sort out single-threaded vs multithreaded library generation. --- libraries/libavl/libavl.dsp | 2 +- libraries/libldap/libldap.dsp | 2 +- libraries/libldap_r/libldap_r.dsp | 2 +- libraries/libldbm/libldbm.dsp | 2 +- libraries/liblutil/passwd.c | 4 ++-- servers/slapd/back-ldbm/backldbm.dsp | 2 +- servers/slapd/back-ldbm/modrdn.c | 1 - servers/slapd/daemon.c | 3 ++- servers/slapd/slapd.dsp | 9 +++++---- servers/slapd/slapd.dsw | 27 --------------------------- 10 files changed, 14 insertions(+), 40 deletions(-) diff --git a/libraries/libavl/libavl.dsp b/libraries/libavl/libavl.dsp index 7edccebfb2..c9146bd0ed 100644 --- a/libraries/libavl/libavl.dsp +++ b/libraries/libavl/libavl.dsp @@ -39,7 +39,7 @@ CPP=cl.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/libraries/libldap/libldap.dsp b/libraries/libldap/libldap.dsp index 03e6251e60..9e98048949 100644 --- a/libraries/libldap/libldap.dsp +++ b/libraries/libldap/libldap.dsp @@ -60,7 +60,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug\libldap" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "..\..\include" /I "..\regex" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/libraries/libldap_r/libldap_r.dsp b/libraries/libldap_r/libldap_r.dsp index cb33c31a88..beb07505d6 100644 --- a/libraries/libldap_r/libldap_r.dsp +++ b/libraries/libldap_r/libldap_r.dsp @@ -60,7 +60,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "..\..\include" /I "..\regex" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/libraries/libldbm/libldbm.dsp b/libraries/libldbm/libldbm.dsp index 891ccffc19..e44dc46016 100644 --- a/libraries/libldbm/libldbm.dsp +++ b/libraries/libldbm/libldbm.dsp @@ -60,7 +60,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "..\..\include" /I "..\..\..\db-2.7.3\build_win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/libraries/liblutil/passwd.c b/libraries/liblutil/passwd.c index a8f69dc5ff..beca1aa11c 100644 --- a/libraries/liblutil/passwd.c +++ b/libraries/liblutil/passwd.c @@ -81,7 +81,7 @@ lutil_passwd( unsigned char *orig_pass = NULL; /* base64 un-encode password */ - orig_pass = (unsigned char *)malloc(pw_len * 0.75 + 1); + orig_pass = (unsigned char *)malloc((size_t)(pw_len * 0.75 + 1)); if ((rc = lutil_b64_pton(p, orig_pass, pw_len)) < 0) { free(orig_pass); @@ -111,7 +111,7 @@ lutil_passwd( unsigned char *orig_pass = NULL; /* base64 un-encode password */ - orig_pass = (unsigned char *)malloc(pw_len * 0.75 + 1); + orig_pass = (unsigned char *)malloc((size_t)(pw_len * 0.75 + 1)); if ((rc = lutil_b64_pton(p, orig_pass, pw_len)) < 0) { free(orig_pass); diff --git a/servers/slapd/back-ldbm/backldbm.dsp b/servers/slapd/back-ldbm/backldbm.dsp index a955b4bc3a..190647cfcf 100644 --- a/servers/slapd/back-ldbm/backldbm.dsp +++ b/servers/slapd/back-ldbm/backldbm.dsp @@ -60,7 +60,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "..\\" /I "..\..\..\include" /I "..\..\..\libraries\regex" /I "..\..\..\..\db-2.7.3\build_win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c +# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "..\\" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/servers/slapd/back-ldbm/modrdn.c b/servers/slapd/back-ldbm/modrdn.c index ba3196b9b4..381d2b3f1c 100644 --- a/servers/slapd/back-ldbm/modrdn.c +++ b/servers/slapd/back-ldbm/modrdn.c @@ -42,7 +42,6 @@ ldbm_back_modrdn( char *matched = NULL; char *p_dn = NULL, *p_ndn = NULL; char *new_dn = NULL, *new_ndn = NULL; - char sep[2]; Entry *e, *p = NULL; int rootlock = 0; int rc = -1; diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c index 229f560139..59a75c86cc 100644 --- a/servers/slapd/daemon.c +++ b/servers/slapd/daemon.c @@ -248,7 +248,8 @@ slapd_daemon_task( } while ( !slapd_shutdown ) { - int i, ns, nfds; + unsigned int i; + int ns, nfds; fd_set readfds; fd_set writefds; diff --git a/servers/slapd/slapd.dsp b/servers/slapd/slapd.dsp index 3f33c2dcf9..cd0a1da406 100644 --- a/servers/slapd/slapd.dsp +++ b/servers/slapd/slapd.dsp @@ -38,9 +38,10 @@ RSC=rc.exe # PROP Use_Debug_Libraries 0 # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -48,7 +49,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 /machine:I386 -# ADD 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 /machine:I386 +# ADD LINK32 hs_regex.lib libdb.lib wsock32.lib /nologo /subsystem:console /machine:I386 !ELSEIF "$(CFG)" == "slapd - Win32 Debug" @@ -64,7 +65,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I "..\..\libraries\regex" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -72,7 +73,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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib ..\..\..\db-2.7.3\build_win32\debug\libdbs.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 hs_regex.lib libdb.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF diff --git a/servers/slapd/slapd.dsw b/servers/slapd/slapd.dsw index f7495f4e42..90e0c4d8b3 100644 --- a/servers/slapd/slapd.dsw +++ b/servers/slapd/slapd.dsw @@ -3,18 +3,6 @@ Microsoft Developer Studio Workspace File, Format Version 5.00 ############################################################################### -Project: "backbdb2"=".\back-bdb2\backbdb2.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - Project: "backldbm"=".\back-ldbm\backldbm.dsp" - Package Owner=<4> Package=<5> @@ -111,18 +99,6 @@ Package=<4> ############################################################################### -Project: "regex"=..\..\libraries\regex\regex.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - Project: "slapd"=.\slapd.dsp - Package Owner=<4> Package=<5> @@ -147,9 +123,6 @@ Package=<4> Project_Dep_Name liblutil End Project Dependency Begin Project Dependency - Project_Dep_Name regex - End Project Dependency - Begin Project Dependency Project_Dep_Name libldap_r End Project Dependency Begin Project Dependency -- 2.39.5