Commit 4b3a13ab authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Update Alpha2 with NT4 changes.

parent 904f6d11
......@@ -8,6 +8,7 @@
#include <ac/socket.h>
#include <ac/string.h>
#include <ac/unistd.h>
#include <lber.h>
#include <ldap.h>
......
......@@ -8,6 +8,7 @@
#include <ac/ctype.h>
#include <ac/string.h>
#include <ac/time.h>
#include <ac/unistd.h>
#include <lber.h>
#include <ldap.h>
......
/* Generic stdarg.h */
#ifndef _AC_STDARG_H
#define _AC_STDARG_H 1
#if defined( HAVE_STDARG_H ) && \
( defined( __STDC__ ) || defined( _WIN32 ) )
# include <stdarg.h>
# define HAVE_STDARG 1
#else
# include <varargs.h>
#endif
#endif /* _AC_STDARG_H */
......@@ -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 );
......
......@@ -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 );
......
......@@ -56,7 +56,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();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment