--- libraries/liblber/decode.c	1998/08/13 18:23:30	1.3.4.1
+++ libraries/liblber/decode.c	1998/08/17 21:26:26	1.4
@@ -17,18 +17,17 @@
 #include <stdarg.h>
 #include "macos.h"
 #else /* MACOS */
-#if defined(NeXT) || defined(VMS)
+
+#if defined(NeXT) || defined(VMS) || defined(__FreeBSD__)
 #include <stdlib.h>
-#else /* next || vms */
-#ifndef __FreeBSD__
+#else /* next || vms || freebsd */
 #include <malloc.h>
-#endif
-#endif /* next || vms */
-#if defined(BC31) || defined(_WIN32) || defined(sunos5)
+#endif /* next || vms || freebsd */
+#if defined(BC31) || defined(_WIN32)
 #include <stdarg.h>
-#else /* BC31 || _WIN32 || defined(sunos5) */
+#else /* BC31 || _WIN32 */
 #include <varargs.h>
-#endif /* BC31 || _WIN32 || defined(sunos5) */
+#endif /* BC31 || _WIN32 */
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -387,7 +386,7 @@ ber_next_element( BerElement *ber, unsig
 /* VARARGS */
 unsigned long
 ber_scanf(
-#if defined( MACOS ) || defined( BC31 ) || defined( _WIN32 ) || defined(sunos5)
+#if defined( MACOS ) || defined( BC31 ) || defined( _WIN32 )
 	BerElement *ber, char *fmt, ... )
 #else
 	va_alist )
@@ -395,7 +394,7 @@ va_dcl
 #endif
 {
 	va_list		ap;
-#if !defined( MACOS ) && !defined( BC31 ) && !defined( _WIN32 ) && !defined(sunos5)
+#if !defined( MACOS ) && !defined( BC31 ) && !defined( _WIN32 )
 	BerElement	*ber;
 	char		*fmt;
 #endif
@@ -406,7 +405,7 @@ va_dcl
 	long		*l, rc, tag;
 	unsigned long	len;
 
-#if defined( MACOS ) || defined( BC31 ) || defined( _WIN32 ) || defined(sunos5)
+#if defined( MACOS ) || defined( BC31 ) || defined( _WIN32 )
 	va_start( ap, fmt );
 #else
 	va_start( ap );