From 36378ea4118cd56f3c8ff1186ee1765b31037ed5 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Fri, 6 Nov 1998 01:18:49 +0000 Subject: [PATCH] Updated MSVC5 workspaces and projects. Added ac/stdarg.h and updated liblber encode/decode to use it. --- clients/tools/ldapdelete.c | 3 +++ clients/tools/ldapmodify.c | 3 +++ clients/tools/ldapmodrdn.c | 3 +++ clients/tools/ldapsearch.c | 3 +++ clients/tools/ldapsearch.dsp | 4 ++-- include/ac/stdarg.h | 8 ++++---- libraries/liblber/decode.c | 12 ++++-------- libraries/liblber/encode.c | 13 ++++--------- libraries/liblber/liblber.dsp | 4 ++-- libraries/libldap/libldap.dsp | 12 ++++++++++-- libraries/libldap/os-ip.c | 2 +- libraries/libldif/libldif.dsp | 4 ++-- libraries/liblutil/liblutil.dsp | 4 ++-- 13 files changed, 43 insertions(+), 32 deletions(-) diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c index 03c5143794..d4784b245b 100644 --- a/clients/tools/ldapdelete.c +++ b/clients/tools/ldapdelete.c @@ -142,6 +142,9 @@ main( argc, argv ) ldap_unbind( ld ); exit( rc ); + + /* UNREACHABLE */ + return(0); } diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c index 074c5259e7..92766e8d69 100644 --- a/clients/tools/ldapmodify.c +++ b/clients/tools/ldapmodify.c @@ -226,6 +226,9 @@ main( int argc, char **argv ) } exit( rc ); + + /* UNREACHABLE */ + return(0); } diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c index e8e71473e0..058c475462 100644 --- a/clients/tools/ldapmodrdn.c +++ b/clients/tools/ldapmodrdn.c @@ -174,6 +174,9 @@ main( argc, argv ) ldap_unbind( ld ); exit( rc ); + + /* UNREACHABLE */ + return(0); } static int domodrdn( diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c index d7411e86bb..ba586cea9c 100644 --- a/clients/tools/ldapsearch.c +++ b/clients/tools/ldapsearch.c @@ -316,6 +316,9 @@ char **argv; ldap_unbind( ld ); exit( rc ); + + /* UNREACHABLE */ + return(0); } diff --git a/clients/tools/ldapsearch.dsp b/clients/tools/ldapsearch.dsp index 9927479c89..4150735c8b 100644 --- a/clients/tools/ldapsearch.dsp +++ b/clients/tools/ldapsearch.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # 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 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /Ze /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 @@ -67,7 +67,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 /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /Ze /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 diff --git a/include/ac/stdarg.h b/include/ac/stdarg.h index 751e4bf7c2..8b805c8abc 100644 --- a/include/ac/stdarg.h +++ b/include/ac/stdarg.h @@ -1,14 +1,14 @@ /* Generic stdarg.h */ #ifndef _AC_STDARG_H -#define _AC_STDARG_H +#define _AC_STDARG_H 1 #if defined( HAVE_STDARG_H ) && \ - ( defined( __STDC__) || defined( __WIN32 ) -# define HAVE_STDARG 1 + ( defined( __STDC__ ) || defined( _WIN32 ) ) # include +# define HAVE_STDARG 1 #else -# include +# include #endif #endif /* _AC_STDARG_H */ diff --git a/libraries/liblber/decode.c b/libraries/liblber/decode.c index b7606e3d4f..838653ef1d 100644 --- a/libraries/liblber/decode.c +++ b/libraries/liblber/decode.c @@ -19,11 +19,7 @@ #include #endif -#if defined( HAVE_STDARG_H ) && __STDC__ -#include -#else -#include -#endif +#include #include #include @@ -370,7 +366,7 @@ ber_next_element( BerElement *ber, unsigned long *len, char *last ) /* VARARGS */ unsigned long ber_scanf -#if defined( HAVE_STDARG_H ) && __STDC__ +#if HAVE_STDARG ( BerElement *ber, char *fmt, ... ) #else ( va_alist ) @@ -378,7 +374,7 @@ va_dcl #endif { va_list ap; -#if !(defined( HAVE_STDARG_H ) && __STDC__) +#ifndef HAVE_STDARG BerElement *ber; char *fmt; #endif @@ -389,7 +385,7 @@ va_dcl long *l; unsigned long rc, tag, len; -#if defined( HAVE_STDARG_H ) && __STDC__ +#ifdef HAVE_STDARG va_start( ap, fmt ); #else va_start( ap ); diff --git a/libraries/liblber/encode.c b/libraries/liblber/encode.c index d81b851e58..37a0a44971 100644 --- a/libraries/liblber/encode.c +++ b/libraries/liblber/encode.c @@ -16,12 +16,7 @@ #include #include -#if defined( HAVE_STDARG_H ) && __STDC__ -#include -#else -#include -#endif - +#include #include #include @@ -509,7 +504,7 @@ ber_put_set( BerElement *ber ) /* VARARGS */ int ber_printf -#if defined( HAVE_STDARG_H ) && __STDC__ +#ifdef HAVE_STDARG ( BerElement *ber, char *fmt, ... ) #else ( va_alist ) @@ -517,7 +512,7 @@ va_dcl #endif { va_list ap; -#if !(defined( HAVE_STDARG_H ) && __STDC__) +#ifndef HAVE_STDARG BerElement *ber; char *fmt; #endif @@ -526,7 +521,7 @@ va_dcl int rc, i; unsigned long len; -#if defined( HAVE_STDARG_H ) && __STDC__ +#ifdef HAVE_STDARG va_start( ap, fmt ); #else va_start( ap ); diff --git a/libraries/liblber/liblber.dsp b/libraries/liblber/liblber.dsp index a64a040276..f307c0d8ca 100644 --- a/libraries/liblber/liblber.dsp +++ b/libraries/liblber/liblber.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 /Ze /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -60,7 +60,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug\liblber" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /Z7 /Od /I "..\..\include" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /Ze /W3 /GX /Z7 /Od /I "..\..\include" /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/libldap.dsp b/libraries/libldap/libldap.dsp index 0565123b15..b6842cbd31 100644 --- a/libraries/libldap/libldap.dsp +++ b/libraries/libldap/libldap.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 /Ze /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -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 /W3 /GX /Z7 /Od /I "..\..\include" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /Ze /W3 /GX /Z7 /Od /I "..\..\include" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -160,6 +160,10 @@ SOURCE=.\getvalues.c # End Source File # Begin Source File +SOURCE=.\init.c +# End Source File +# Begin Source File + SOURCE=.\kbind.c # End Source File # Begin Source File @@ -192,6 +196,10 @@ SOURCE=.\open.c # End Source File # Begin Source File +SOURCE=.\options.c +# End Source File +# Begin Source File + SOURCE=".\os-ip.c" # End Source File # Begin Source File diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c index 03c055b617..0288968941 100644 --- a/libraries/libldap/os-ip.c +++ b/libraries/libldap/os-ip.c @@ -54,7 +54,7 @@ ldap_connect_to_host( Sockbuf *sb, char *host, unsigned long address, connected = use_hp = 0; - if ( host != NULL && ( address = inet_addr( host )) == -1UL ) { + if ( host != NULL && ( address = inet_addr( host )) == (unsigned long) -1L ) { if ( (hp = gethostbyname( host )) == NULL ) { #ifdef HAVE_WINSOCK errno = WSAGetLastError(); diff --git a/libraries/libldif/libldif.dsp b/libraries/libldif/libldif.dsp index a39e0fa065..ebf42f22fc 100644 --- a/libraries/libldif/libldif.dsp +++ b/libraries/libldif/libldif.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 /Ze /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -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 /W3 /GX /Z7 /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /Ze /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/liblutil.dsp b/libraries/liblutil/liblutil.dsp index 59de922e50..0e5186ac99 100644 --- a/libraries/liblutil/liblutil.dsp +++ b/libraries/liblutil/liblutil.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 /Ze /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -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 /W3 /GX /Z7 /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /Ze /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 -- 2.39.5