--- libraries/liblber/decode.c	1998/08/17 21:26:26	1.4
+++ libraries/liblber/decode.c	1998/09/28 17:27:54	1.4.10.4
@@ -11,46 +11,42 @@
  * is provided ``as is'' without express or implied warranty.
  */
 
+#define DISABLE_BRIDGE /* disable LDAP_BRIDGE code */
+#include "portable.h"
+
 #include <stdio.h>
-#ifdef MACOS
-#include <stdlib.h>
-#include <stdarg.h>
-#include "macos.h"
-#else /* MACOS */
 
-#if defined(NeXT) || defined(VMS) || defined(__FreeBSD__)
+#ifdef STDC_HEADERS
 #include <stdlib.h>
-#else /* next || vms || freebsd */
-#include <malloc.h>
-#endif /* next || vms || freebsd */
-#if defined(BC31) || defined(_WIN32)
 #include <stdarg.h>
-#else /* BC31 || _WIN32 */
+#else
 #include <varargs.h>
-#endif /* BC31 || _WIN32 */
+#endif
+
+#include <ac/string.h>
+
+#ifdef MACOS
+#include "macos.h"
+#endif /* MACOS */
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+
 #ifdef PCNFS
 #include <tklib.h>
 #endif /* PCNFS */
-#endif /* MACOS */
-
 #if defined( DOS ) || defined( _WIN32 )
 #include "msdos.h"
 #endif /* DOS */
 
-#include <string.h>
 #include "lber.h"
 
 #ifdef LDAP_DEBUG
 int	lber_debug;
 #endif
 
-#ifdef NEEDPROTOS
-static int ber_getnint( BerElement *ber, long *num, int len );
-#endif /* NEEDPROTOS */
-
+static int ber_getnint LDAP_P(( BerElement *ber, long *num, int len ));
 
 /* return the tag - LBER_DEFAULT returned means trouble */
 unsigned long
@@ -385,16 +381,16 @@ ber_next_element( BerElement *ber, unsig
 
 /* VARARGS */
 unsigned long
-ber_scanf(
-#if defined( MACOS ) || defined( BC31 ) || defined( _WIN32 )
-	BerElement *ber, char *fmt, ... )
+ber_scanf
+#ifdef STDC_HEADERS
+	( BerElement *ber, char *fmt, ... )
 #else
-	va_alist )
+	( va_alist )
 va_dcl
 #endif
 {
 	va_list		ap;
-#if !defined( MACOS ) && !defined( BC31 ) && !defined( _WIN32 )
+#ifndef STDC_HEADERS
 	BerElement	*ber;
 	char		*fmt;
 #endif
@@ -405,7 +401,7 @@ va_dcl
 	long		*l, rc, tag;
 	unsigned long	len;
 
-#if defined( MACOS ) || defined( BC31 ) || defined( _WIN32 )
+#if STDC_HEADERS
 	va_start( ap, fmt );
 #else
 	va_start( ap );
@@ -539,9 +535,9 @@ va_dcl
 			break;
 
 		default:
-#ifndef NO_USERINTERFACE
+#ifdef LDAP_LIBUI
 			fprintf( stderr, "unknown fmt %c\n", *fmt );
-#endif /* NO_USERINTERFACE */
+#endif /* LDAP_LIBUI */
 			rc = LBER_DEFAULT;
 			break;
 		}