clean up includes

diff --git a/libraries/liblber/bprint.c b/libraries/liblber/bprint.c
index 1dbc833b99a98e806ad07abfb178c5eb39117960..882facd70d717b8310f6d6bb659ed8a88063fda1 100644 (file)
--- a/libraries/liblber/bprint.c
+++ b/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  */
 

diff --git a/libraries/liblber/decode.c b/libraries/liblber/decode.c
index 03a5c74d850130eba8d4530cb50e99c1a01ded1e..b99f97ac9d68a1c2bf194832cdbabe40a93380e9 100644 (file)
--- a/libraries/liblber/decode.c
+++ b/libraries/liblber/decode.c
@@ -23,7 +23,6 @@
 #endif
 
 #include <ac/string.h>
-#include <sys/types.h>
 #include <ac/socket.h>
 
 #include "lber.h"

diff --git a/libraries/liblber/encode.c b/libraries/liblber/encode.c
index 561e0f162d875f0e8086207764a4b61aa111ba7e..af320f372c360fc87ba012733977013581036af9 100644 (file)
--- a/libraries/liblber/encode.c
+++ b/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"
 

diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c
index bbe6c82dd1aa28c90dfd410b894704099e14eb9f..0b9a59d1cfcab5cb557fd83bf21f3240b5c90540 100644 (file)
--- a/libraries/liblber/io.c
+++ b/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

diff --git a/libraries/libldap/addentry.c b/libraries/libldap/addentry.c
index 3b5c752a88d08995718ed15644cc8e337be9fc73..ce85e8cb35ebe570dc5561cb8c9f731c93c5e0ab 100644 (file)
--- a/libraries/libldap/addentry.c
+++ b/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>

diff --git a/libraries/libldap/disptmpl.c b/libraries/libldap/disptmpl.c
index 291316dcb62d8f9422630b42a162bf2e077c1558..f4aa2303131eccc696da538d9f38e1edded909db 100644 (file)
--- a/libraries/libldap/disptmpl.c
+++ b/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"

diff --git a/libraries/libldap/dsparse.c b/libraries/libldap/dsparse.c
index 6fc1e6e2961f13552be0cb3a680566787603a584..86ccf7136074818d027a58996a5ba58f4775e6e1 100644 (file)
--- a/libraries/libldap/dsparse.c
+++ b/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>
 

diff --git a/libraries/libldap/free.c b/libraries/libldap/free.c
index adf1d7b3c9747f34d58a8bfe35a41f855513e916..d0e47686e5e11259a543149644e094a53aab87e1 100644 (file)
--- a/libraries/libldap/free.c
+++ b/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>
 

diff --git a/libraries/libldap/friendly.c b/libraries/libldap/friendly.c
index fc90fc9cdc567fd63256893c4cba08e95354675b..686ac882aa9add772ef5ee8e7926ef82fc692806 100644 (file)
--- a/libraries/libldap/friendly.c
+++ b/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>

diff --git a/libraries/libldap/getattr.c b/libraries/libldap/getattr.c
index 6e95b7d5f39161d36330079d2fb1ac5e0f8089ca..2975e674e0fe4729cdc929f702c685d8cde04091 100644 (file)
--- a/libraries/libldap/getattr.c
+++ b/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>

diff --git a/libraries/libldap/getdn.c b/libraries/libldap/getdn.c
index 19ef4d45e72eefeb8394924034cdd21afb334265..fc2b3264777c95819efc68c1165ed96ec93308cd 100644 (file)
--- a/libraries/libldap/getdn.c
+++ b/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>

diff --git a/libraries/libldap/getentry.c b/libraries/libldap/getentry.c
index df25d7a3ab215e8682d7acd95a1772816ada239f..5d7776dea19ef51de578cff4869b52a811af8ff7 100644 (file)
--- a/libraries/libldap/getentry.c
+++ b/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>

diff --git a/libraries/libldap/getfilter.c b/libraries/libldap/getfilter.c
index 68bd3fd26afb52adf6a8f2cfd6886369bc31fb9c..fa286bc96088179cf27962bcf4d33fe32736ffc8 100644 (file)
--- a/libraries/libldap/getfilter.c
+++ b/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>

diff --git a/libraries/libldap/getvalues.c b/libraries/libldap/getvalues.c
index 3abd28560a7da092c48c058e34281c138f40c2fd..c3131ade09a3fd3364e472805c6cfd7d7ce5df77 100644 (file)
--- a/libraries/libldap/getvalues.c
+++ b/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>

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index bb65762987b225ad3274c34e4dc683e101b4f990..5a3fe703a247c916c43dae778727faa8513fdba6 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/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 */

diff --git a/libraries/libldap/search.c b/libraries/libldap/search.c
index f588e2816a7b36e01399c26c614b361c5c39e672..191d346710778af55129c3e6229d24635b60f3d3 100644 (file)
--- a/libraries/libldap/search.c
+++ b/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>

diff --git a/libraries/libldap/sort.c b/libraries/libldap/sort.c
index fbf1dd4be38346c220dad226295c097ca5bd505a..7e90d9fcd6ccd34bd7269e7afe2fa925e643b8f1 100644 (file)
--- a/libraries/libldap/sort.c
+++ b/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>
 

diff --git a/libraries/libldap/srchpref.c b/libraries/libldap/srchpref.c
index 8e6fd26e30b73c18fd95f24bb588ecf315fc3cd2..a603e6edb353dc1323d182f78f783e0f1601c57f 100644 (file)
--- a/libraries/libldap/srchpref.c
+++ b/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>

diff --git a/libraries/libldap/ttest.dsw b/libraries/libldap/ttest.dsw
index a58e4768394c9e76d292a0c242b8a20e7e0e7bff..3691b92d33faf48b4bb5f41cce1943f0b3f0b333 100644 (file)
--- a/libraries/libldap/ttest.dsw
+++ b/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
 }}}
 
 ###############################################################################

diff --git a/libraries/libldap/url.c b/libraries/libldap/url.c
index badf8821103274be0dc536aff097800c55cb4d3b..83ccbdc5460bf73e198985d0265b17dabb91816b 100644 (file)
--- a/libraries/libldap/url.c
+++ b/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>