clean up includes

libraries/liblber/bprint.c

@@ -3,8 +3,8 @@
 
 #if defined( LDAP_DEBUG ) && defined( LDAP_LIBUI )
 #include <stdio.h>
-#include <ctype.h>
 
+#include <ac/ctype.h>
 #include <ac/string.h>
 #endif /* LDAP_DEBUG && LDAP_LIBUI  */
 

libraries/liblber/decode.c

@@ -23,7 +23,6 @@
 #endif
 
 #include <ac/string.h>
-#include <sys/types.h>
 #include <ac/socket.h>
 
 #include "lber.h"

libraries/liblber/encode.c

@@ -15,7 +15,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ac/string.h>
 
 #ifdef STDC_HEADERS
 #include <stdarg.h>
@@ -23,8 +22,8 @@
 #include <varargs.h>
 #endif
 
-#include <sys/types.h>
 #include <ac/socket.h>
+#include <ac/string.h>
 
 #include "lber.h"
 

libraries/liblber/io.c

@@ -16,14 +16,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <ac/ctype.h>
+#include <ac/errno.h>
+#include <ac/socket.h>
 #include <ac/string.h>
-#include <ctype.h>
 #include <ac/unistd.h>
 
-#include <errno.h>
-#include <sys/types.h>
-#include <ac/socket.h>
-
 #ifdef HAVE_IO_H
 #include <io.h>
 #endif

libraries/libldap/addentry.c

@@ -13,8 +13,8 @@ static char copyright[] = "@(#) Copyright (c) 1990 Regents of the University of
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
 
+#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>

libraries/libldap/disptmpl.c

@@ -17,17 +17,16 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
 
+#include <ac/ctype.h>
 #include <ac/string.h>
 #include <ac/time.h>
+#include <ac/unistd.h>
 
 #ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
 #endif
 
-#include <ac/unistd.h>
-
 #include "lber.h"
 #include "ldap.h"
 #include "disptmpl.h"

libraries/libldap/dsparse.c

@@ -19,8 +19,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
 
+#include <ac/ctype.h>
 #include <ac/string.h>
 #include <ac/time.h>
 

libraries/libldap/free.c

@@ -14,8 +14,8 @@ static char copyright[] = "@(#) Copyright (c) 1994 The Regents of the University
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
 
+#include <ac/ctype.h>
 #include <ac/string.h>
 #include <ac/time.h>
 

libraries/libldap/friendly.c

@@ -13,8 +13,8 @@ static char copyright[] = "@(#) Copyright (c) 1993 Regents of the University of
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
 
+#include <ac/ctype.h>
 #include <ac/errno.h>
 #include <ac/socket.h>
 #include <ac/string.h>

libraries/libldap/getattr.c

@@ -13,8 +13,8 @@ static char copyright[] = "@(#) Copyright (c) 1990 Regents of the University of
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
 
+#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>

libraries/libldap/getdn.c

@@ -13,8 +13,8 @@ static char copyright[] = "@(#) Copyright (c) 1990 Regents of the University of
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
 
+#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>

libraries/libldap/getentry.c

@@ -13,8 +13,8 @@ static char copyright[] = "@(#) Copyright (c) 1990 Regents of the University of
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
 
+#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>

libraries/libldap/getfilter.c

@@ -13,8 +13,8 @@ static char copyright[] = "@(#) Copyright (c) 1993 Regents of the University of
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
 
+#include <ac/ctype.h>
 #include <ac/errno.h>
 #include <ac/regex.h>
 #include <ac/string.h>

libraries/libldap/getvalues.c

@@ -13,8 +13,8 @@ static char copyright[] = "@(#) Copyright (c) 1990 Regents of the University of
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
 
+#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>

libraries/libldap/ldap-int.h

@@ -22,7 +22,7 @@
 #endif /* LDAP_DNS */
 #endif /* LDAP_REFERRALS */
 
-
+LDAP_BEGIN_DECL
 /*
  * in cache.c
  */
@@ -133,4 +133,6 @@ int ldap_t61_to_8859( char **bufp, unsigned long *buflenp, int free_input );
 extern 
 int ldap_8859_to_t61( char **bufp, unsigned long *buflenp, int free_input );
 #endif /* LDAP_CHARSET_8859 == LDAP_DEFAULT_CHARSET */
+
+LDAP_END_DECL
 #endif /* STR_TRANSLATION && LDAP_DEFAULT_CHARSET */

libraries/libldap/search.c

@@ -12,9 +12,9 @@ static char copyright[] = "@(#) Copyright (c) 1990 Regents of the University of
 #endif
 
 #include <stdio.h>
-#include <ctype.h>
 #include <stdlib.h>
 
+#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>

libraries/libldap/sort.c

@@ -16,8 +16,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
 
+#include <ac/ctype.h>
 #include <ac/string.h>
 #include <ac/time.h>
 

libraries/libldap/srchpref.c

@@ -17,11 +17,11 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
 
+#include <ac/ctype.h>
 #include <ac/string.h>
-#include <ac/unistd.h>
 #include <ac/time.h>
+#include <ac/unistd.h>
 
 #ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>

libraries/libldap/ttest.dsw

@@ -3,6 +3,18 @@ Microsoft Developer Studio Workspace File, Format Version 5.00
 
 ###############################################################################
 
+Project: "liblber"=..\liblber\liblber.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "libldap"=.\libldap.dsp - Package Owner=<4>
 
 Package=<5>
@@ -26,6 +38,9 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libldap
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name liblber
+    End Project Dependency
 }}}
 
 ###############################################################################

libraries/libldap/url.c

@@ -25,8 +25,8 @@ static char copyright[] = "@(#) Copyright (c) 1996 Regents of the University of
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
 
+#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>