--- libraries/liblber/decode.c	1998/12/31 19:32:05	1.5.2.4
+++ libraries/liblber/decode.c	1998/10/26 00:18:42	1.6
@@ -1,9 +1,5 @@
 /* decode.c - ber input decoding routines */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-/* Portions
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
  *
@@ -18,14 +14,18 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
 
-#include <ac/stdarg.h>
+#ifdef STDC_HEADERS
+#include <stdlib.h>
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
 
 #include <ac/string.h>
 #include <ac/socket.h>
 
-#include "lber.h"
+#include "lber-int.h"
 
 #ifdef LDAP_DEBUG
 int	lber_debug;
@@ -40,7 +40,7 @@ ber_get_tag( BerElement *ber )
 	unsigned char	xbyte;
 	unsigned long	tag;
 	char		*tagp;
-	unsigned int	i;
+	int		i;
 
 	if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 )
 		return( LBER_DEFAULT );
@@ -367,7 +367,7 @@ ber_next_element( BerElement *ber, unsig
 /* VARARGS */
 unsigned long
 ber_scanf
-#if HAVE_STDARG
+#ifdef STDC_HEADERS
 	( BerElement *ber, char *fmt, ... )
 #else
 	( va_alist )
@@ -375,7 +375,7 @@ va_dcl
 #endif
 {
 	va_list		ap;
-#ifndef HAVE_STDARG
+#ifndef STDC_HEADERS
 	BerElement	*ber;
 	char		*fmt;
 #endif
@@ -383,10 +383,10 @@ va_dcl
 	char		*s, **ss, ***sss;
 	struct berval 	***bv, **bvp, *bval;
 	int		*i, j;
-	long		*l;
-	unsigned long	rc, tag, len;
+	long		*l, rc, tag;
+	unsigned long	len;
 
-#ifdef HAVE_STDARG
+#if STDC_HEADERS
 	va_start( ap, fmt );
 #else
 	va_start( ap );