upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-25 17:19:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated MSVC5 workspaces and projects.

Browse source 
Added ac/stdarg.h and updated liblber encode/decode to use it.
This commit is contained in:
Kurt Zeilenga 1998-11-06 01:18:49 +00:00
parent 0221763eac
commit 36378ea411
13 changed files with 43 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
clients/tools/ldapdelete.c
View file

@ -142,6 +142,9 @@ main( argc, argv )
ldap_unbind( ld );
exit( rc );
/* UNREACHABLE */
return(0);
}

3
clients/tools/ldapmodify.c
View file

@ -226,6 +226,9 @@ main( int argc, char **argv )
}
exit( rc );
/* UNREACHABLE */
return(0);
}

3
clients/tools/ldapmodrdn.c
View file

@ -174,6 +174,9 @@ main( argc, argv )
ldap_unbind( ld );
exit( rc );
/* UNREACHABLE */
return(0);
}
static int domodrdn(

3
clients/tools/ldapsearch.c
View file

@ -316,6 +316,9 @@ char **argv;
ldap_unbind( ld );
exit( rc );
/* UNREACHABLE */
return(0);
}

4
clients/tools/ldapsearch.dsp
View file

@ -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

8
include/ac/stdarg.h
View file

@ -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 <stdarg.h>
# define HAVE_STDARG 1
#else
# include <vararg.h>
# include <varargs.h>
#endif
#endif /* _AC_STDARG_H */

12
libraries/liblber/decode.c
View file

@ -19,11 +19,7 @@
#include <stdlib.h>
#endif
#if defined( HAVE_STDARG_H ) && __STDC__
#include <stdarg.h>
#else
#include <varargs.h>
#endif
#include <ac/stdarg.h>
#include <ac/string.h>
#include <ac/socket.h>
@ -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 );

13
libraries/liblber/encode.c
View file

@ -16,12 +16,7 @@
#include <stdio.h>
#include <stdlib.h>
#if defined( HAVE_STDARG_H ) && __STDC__
#include <stdarg.h>
#else
#include <varargs.h>
#endif
#include <ac/stdarg.h>
#include <ac/socket.h>
#include <ac/string.h>
@ -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 );

4
libraries/liblber/liblber.dsp
View file

@ -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

12
libraries/libldap/libldap.dsp
View file

@ -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

2
libraries/libldap/os-ip.c
View file

@ -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();

4
libraries/libldif/libldif.dsp
View file

@ -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

4
libraries/liblutil/liblutil.dsp
View file

@ -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