From: Kurt Zeilenga Date: Tue, 4 May 1999 04:30:43 +0000 (+0000) Subject: Fix "configurations". X-Git-Tag: OPENLDAP_SLAPD_BACK_LDAP~83 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=af25d94db953f7102c57bdf55ba5387df0546641;p=openldap Fix "configurations". --- diff --git a/clients/ud/ud.dsp b/clients/ud/ud.dsp index 4e0afa8a1c..f8ec50b5cd 100644 --- a/clients/ud/ud.dsp +++ b/clients/ud/ud.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=ud - Win32 Debug +CFG=ud - Win32 Single Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,12 +13,15 @@ CFG=ud - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "ud.mak" CFG="ud - Win32 Debug" +!MESSAGE NMAKE /f "ud.mak" CFG="ud - Win32 Single Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "ud - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "ud - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "ud - Win32 Single Release" (based on\ + "Win32 (x86) Console Application") +!MESSAGE "ud - Win32 Single Debug" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -75,12 +78,64 @@ 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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD LINK32 oldap32.lib olber32.lib oldif32.lib olutil32.lib ws2_32.lib hs_regex.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\libraries\Debug" +!ELSEIF "$(CFG)" == "ud - Win32 Single Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "ud___Wi0" +# PROP BASE Intermediate_Dir "ud___Wi0" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "ud___Wi0" +# PROP Intermediate_Dir "ud___Wi0" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\include" /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 +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 oldap32.lib olber32.lib oldif32.lib olutil32.lib ws2_32.lib hs_regex.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\libraries\Release" +# ADD LINK32 oldap32.lib olber32.lib oldif32.lib olutil32.lib ws2_32.lib hs_regex.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\libraries\Release" + +!ELSEIF "$(CFG)" == "ud - Win32 Single Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "ud___Wi1" +# PROP BASE Intermediate_Dir "ud___Wi1" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "ud___Wi1" +# PROP Intermediate_Dir "ud___Wi1" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 oldap32.lib olber32.lib oldif32.lib olutil32.lib ws2_32.lib hs_regex.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\libraries\Debug" +# ADD LINK32 oldap32.lib olber32.lib oldif32.lib olutil32.lib ws2_32.lib hs_regex.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\libraries\Debug" + !ENDIF # Begin Target # Name "ud - Win32 Release" # Name "ud - Win32 Debug" +# Name "ud - Win32 Single Release" +# Name "ud - Win32 Single Debug" # Begin Source File SOURCE=.\auth.c @@ -129,9 +184,5 @@ SOURCE=.\ud.h SOURCE=.\util.c # End Source File -# Begin Source File - -SOURCE=.\Version.c -# End Source File # End Target # End Project diff --git a/include/portable.h.nt b/include/portable.h.nt index 7b6aac408f..4236fa4a67 100644 --- a/include/portable.h.nt +++ b/include/portable.h.nt @@ -26,12 +26,16 @@ #define HAVE_REGEX_H 1 /* win32 specific stuff */ +#define sleep _sleep + #define strcasecmp stricmp #define strncasecmp strnicmp #define strdup _strdup + +#define snprintf _snprintf #define vsnprintf _vsnprintf #define vsprintf _vsprintf -#define sleep _sleep + /* define type for caddr_t */ typedef char * caddr_t;