update locking codes, remove old platform specific defines

[openldap] / libraries / libldap / friendly.c

diff --git a/libraries/libldap/friendly.c b/libraries/libldap/friendly.c
index 5d77f0be1cd0bf7b5851bb3aa5166c44ccf33387..0f5aa6acad7097551d67af5f724b90c4e8845e9b 100644 (file)
--- a/libraries/libldap/friendly.c
+++ b/libraries/libldap/friendly.c
@@ -5,28 +5,20 @@
  *  friendly.c
  */
 
+#include "portable.h"
+
 #ifndef lint 
 static char copyright[] = "@(#) Copyright (c) 1993 Regents of the University of Michigan.\nAll rights reserved.\n";
 #endif
 
 #include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#ifdef MACOS
 #include <stdlib.h>
-#include "macos.h"
-#endif /* MACOS */
-
-#if defined( DOS ) || defined( _WIN32 )
-#include <malloc.h>
-#include "msdos.h"
-#endif /* DOS */
-
-#if !defined( MACOS ) && !defined( DOS )
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#endif
+
+#include <ac/ctype.h>
+#include <ac/errno.h>
+#include <ac/socket.h>
+#include <ac/string.h>
+#include <ac/time.h>
 
 #include "lber.h"
 #include "ldap.h"
@@ -40,9 +32,7 @@ ldap_friendly_name( char *filename, char *uname, FriendlyMap **map )
        char    buf[BUFSIZ];
 
        if ( map == NULL ) {
-#if !defined( MACOS ) && !defined( DOS )
                errno = EINVAL;
-#endif
                return( uname );
        }