From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 22 Oct 1998 21:35:53 +0000 (+0000)
Subject: clean up includes
X-Git-Tag: PHP3_TOOL_0_0~18^2~9
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=984a661277ddf23190bca787210a09c373e6561e;p=openldap

clean up includes
---

diff --git a/libraries/liblber/bprint.c b/libraries/liblber/bprint.c
index 1dbc833b99..882facd70d 100644
--- 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 03a5c74d85..b99f97ac9d 100644
--- 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 561e0f162d..af320f372c 100644
--- 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 bbe6c82dd1..0b9a59d1cf 100644
--- 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 3b5c752a88..ce85e8cb35 100644
--- 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 291316dcb6..f4aa230313 100644
--- 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 6fc1e6e296..86ccf71360 100644
--- 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 adf1d7b3c9..d0e47686e5 100644
--- 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 fc90fc9cdc..686ac882aa 100644
--- 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 6e95b7d5f3..2975e674e0 100644
--- 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 19ef4d45e7..fc2b326477 100644
--- 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 df25d7a3ab..5d7776dea1 100644
--- 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 68bd3fd26a..fa286bc960 100644
--- 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 3abd28560a..c3131ade09 100644
--- 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 bb65762987..5a3fe703a2 100644
--- 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 f588e2816a..191d346710 100644
--- 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 fbf1dd4be3..7e90d9fcd6 100644
--- 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 8e6fd26e30..a603e6edb3 100644
--- 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 a58e476839..3691b92d33 100644
--- 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 badf882110..83ccbdc546 100644
--- 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>