Add <ac/param.h> to wrap <sys/param.h>

diff --git a/acconfig.h b/acconfig.h
index 60cfe22420bd505f36adc681632c8cc59f7e64c8..cc19afa69a8b46b0d3d159cdec30b42091940321 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -19,8 +19,6 @@
 /* don't suck in all of the win32 api */
 #define WIN32_LEAN_AND_MEAN
 
-#define MAXPATHLEN _MAX_PATH
-
 /* preprocess out undefined functions */
 #define LOG_DEBUG 0
 #define openlog(a, b)

diff --git a/clients/fax500/main.c b/clients/fax500/main.c
index b94a1a62159c50e60dfdea8f7f559e2094a7f034..440e7d416700b7e68da2bcd85a53bc3a41b338c5 100644 (file)
--- a/clients/fax500/main.c
+++ b/clients/fax500/main.c
@@ -19,6 +19,7 @@
 
 #include <ac/ctype.h>
 #include <ac/errno.h>
+#include <ac/param.h>
 #include <ac/signal.h>
 #include <ac/socket.h>
 #include <ac/string.h>
@@ -28,9 +29,6 @@
 #include <ac/unistd.h>
 #include <ac/wait.h>
 
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif

diff --git a/clients/gopher/go500.c b/clients/gopher/go500.c
index ff3bb2254e51bd90b830968a28424482566108bc..aebc0ce667fcd2f74fb5dfdde4d1f34f549c0c18 100644 (file)
--- a/clients/gopher/go500.c
+++ b/clients/gopher/go500.c
@@ -26,12 +26,9 @@
 #include <ac/unistd.h>
 #include <ac/wait.h>
 
+#include <ac/param.h>
 #include <ac/setproctitle.h>
 
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif

diff --git a/clients/gopher/go500gw.c b/clients/gopher/go500gw.c
index 21939f3ca55b56c29f0618f7d519f0fd0d43338c..2d88e75c40f439446b1bc0b711b24eb56b743e9a 100644 (file)
--- a/clients/gopher/go500gw.c
+++ b/clients/gopher/go500gw.c
@@ -26,12 +26,9 @@
 #include <ac/unistd.h>
 #include <ac/wait.h>
 
+#include <ac/param.h>
 #include <ac/setproctitle.h>
 
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif

diff --git a/clients/mail500/main.c b/clients/mail500/main.c
index 064ed64c348b5b6b560741c715ba937801835062..4e40d1210c665428f2aab582b259d8fbfdff522c 100644 (file)
--- a/clients/mail500/main.c
+++ b/clients/mail500/main.c
@@ -22,6 +22,7 @@
 #include <ac/stdlib.h>
 
 #include <ac/ctype.h>
+#include <ac/param.h>
 #include <ac/signal.h>
 #include <ac/string.h>
 #include <ac/sysexits.h>
@@ -32,10 +33,6 @@
 
 #include <sys/stat.h>
 
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif

diff --git a/include/ac/param.h b/include/ac/param.h
new file mode 100644 (file)
index 0000000..b339e04
--- /dev/null
+++ b/include/ac/param.h
@@ -0,0 +1,26 @@
+/* Generic param.h */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted only
+ * as authorized by the OpenLDAP Public License.  A copy of this
+ * license is available at http://www.OpenLDAP.org/license.html or
+ * in file LICENSE in the top-level directory of the distribution.
+ */
+
+#ifndef _AC_PARAM_H
+#define _AC_PARAM_H
+
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
+#ifndef MAXPATHLEN
+#      ifdef _MAX_PATH
+#              define MAXPATHLEN       _MAX_PATH
+#      endif
+#endif
+
+#endif /* _AC_PARAM_H */

diff --git a/include/portable.h.in b/include/portable.h.in
index 252ddb1ddf38b8e0e9535ffd6b5de17b881ff235..88c86ec7825d90febf19718edf563b1bbaa1ef9b 100644 (file)
--- a/include/portable.h.in
+++ b/include/portable.h.in
@@ -20,8 +20,6 @@
 /* don't suck in all of the win32 api */
 #define WIN32_LEAN_AND_MEAN
 
-#define MAXPATHLEN _MAX_PATH
-
 /* preprocess out undefined functions */
 #define LOG_DEBUG 0
 #define openlog(a, b)

diff --git a/libraries/libldap/charset.c b/libraries/libldap/charset.c
index 7d85f5ad794709691c048205d090c8eb15dc6cd0..1f348dc2093bf514f755ebbdbd4cdf6791c6d81b 100644 (file)
--- a/libraries/libldap/charset.c
+++ b/libraries/libldap/charset.c
@@ -18,13 +18,11 @@
 
 #include <ac/stdlib.h>
 
+#include <ac/param.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
 
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
 
 #include "ldap-int.h"
 

diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index 1551ec66f35102f278ac1d47d99e5b20c1510a9a..8a3be3ac4967ac5e3eee89dc4061295d360ed5f0 100644 (file)
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -16,14 +16,11 @@
 
 #include <ac/stdlib.h>
 
+#include <ac/param.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
 
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
 #include "ldap-int.h"
 
 int ldap_open_defconn( LDAP *ld )

diff --git a/libraries/liblutil/sha1.c b/libraries/liblutil/sha1.c
index a7670f93d84d06072fdb94e52909a172c0234a75..2bc0ba075cdf50dfbe10a6514f3ac714310171c4 100644 (file)
--- a/libraries/liblutil/sha1.c
+++ b/libraries/liblutil/sha1.c
@@ -30,9 +30,7 @@
 /* include socket.h to get sys/types.h and/or winsock2.h */
 #include <ac/socket.h>
 
-#if defined(HAVE_SYS_PARAM_H)
-#include <sys/param.h>
-#endif
+#include <ac/param.h>
 
 #include "lutil_sha1.h"
 

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index 7fb63cf9de27f974932a4c2701bc1ca5796fe579..546e9583b19d919e60f4416297806ca600c6b746 100644 (file)
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -19,9 +19,7 @@
 #include <ac/string.h>
 #include <ac/time.h>
 
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
+#include <ac/param.h>
 
 #include "ldap_pvt.h"
 #include "slap.h"

diff --git a/servers/slapd/lock.c b/servers/slapd/lock.c
index e9f5fda164383f1948fd6279e831ea324d2b8c59..15cc748e02089e7fec223cf39f4569a613960424 100644 (file)
--- a/servers/slapd/lock.c
+++ b/servers/slapd/lock.c
@@ -9,6 +9,7 @@
 
 #include <stdio.h>
 
+#include <ac/param.h>
 #include <ac/string.h>
 #include <ac/socket.h>
 #include <ac/time.h>
@@ -17,9 +18,7 @@
 #ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
 #endif
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
+
 #include "slap.h"
 
 FILE *

diff --git a/servers/slurpd/lock.c b/servers/slurpd/lock.c
index eb957c288b557d7975b4e6fd61e02e8358f84733..c863d4b9e82c85ecf9ed6b480a6562a97d7d51d1 100644 (file)
--- a/servers/slurpd/lock.c
+++ b/servers/slurpd/lock.c
@@ -19,6 +19,7 @@
 
 #include <stdio.h>
 
+#include <ac/param.h>
 #include <ac/string.h>
 #include <ac/socket.h>
 #include <ac/time.h>
@@ -27,9 +28,6 @@
 #ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
 #endif
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
 
 #include "slurp.h"
 

diff --git a/servers/slurpd/replog.c b/servers/slurpd/replog.c
index f4c738061a339f47656ff3a62f3a3b18888b8ff1..d13ea4bb813c2f53704eda42cd644b2863576208 100644 (file)
--- a/servers/slurpd/replog.c
+++ b/servers/slurpd/replog.c
@@ -21,6 +21,7 @@
 #include <stdio.h>
 
 #include <ac/errno.h>
+#include <ac/param.h>
 #include <ac/string.h>
 #include <ac/syslog.h>
 #include <ac/time.h>
@@ -28,10 +29,6 @@
 
 #include <sys/stat.h>
 
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
 #include <fcntl.h>
 
 #include "slurp.h"

diff --git a/servers/slurpd/slurp.h b/servers/slurpd/slurp.h
index 19a6c9d58b9c26ee74d6f398794759c0903da2fd..26368bd4876fa2e1c4ffc08afedee795f49ceaf7 100644 (file)
--- a/servers/slurpd/slurp.h
+++ b/servers/slurpd/slurp.h
@@ -21,13 +21,11 @@
 #endif
 
 #include <ac/errno.h>
+#include <ac/param.h>
 #include <ac/signal.h>
 #include <ac/syslog.h>
 #include <ac/time.h>
 
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
 #include <sys/types.h>
 
 #include <ldap.h>

diff --git a/tests/progs/slapd-addel.c b/tests/progs/slapd-addel.c
index 3497439af3e4a05dc3f4570979ba92773a9fbc74..287dbfdae56c89879507e47d6e6823cee0089fa8 100644 (file)
--- a/tests/progs/slapd-addel.c
+++ b/tests/progs/slapd-addel.c
@@ -10,15 +10,12 @@
 #include <ac/stdlib.h>
 
 #include <ac/ctype.h>
+#include <ac/param.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/unistd.h>
 #include <ac/wait.h>
 
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
 #include <ldap.h>
 
 #define LOOPS  100

diff --git a/tests/progs/slapd-read.c b/tests/progs/slapd-read.c
index 0446534f0d95c6f2619a692da944e5ffedefb3ff..6fa0b905b6a1a7c763668442c68745e956fe59dc 100644 (file)
--- a/tests/progs/slapd-read.c
+++ b/tests/progs/slapd-read.c
@@ -10,15 +10,12 @@
 #include <ac/stdlib.h>
 
 #include <ac/ctype.h>
+#include <ac/param.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/unistd.h>
 #include <ac/wait.h>
 
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
 #include <ldap.h>
 
 #define LOOPS  100

diff --git a/tests/progs/slapd-search.c b/tests/progs/slapd-search.c
index fc5745e797848297d67834ecbe5497e887fb7784..d831e348e692bdc4e1356435f637394ffa921821 100644 (file)
--- a/tests/progs/slapd-search.c
+++ b/tests/progs/slapd-search.c
@@ -10,14 +10,12 @@
 #include <ac/stdlib.h>
 
 #include <ac/ctype.h>
+#include <ac/param.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/unistd.h>
 #include <ac/wait.h>
 
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
 
 #include <ldap.h>
 

diff --git a/tests/progs/slapd-tester.c b/tests/progs/slapd-tester.c
index d1a44e79b1a036f212243df33daa3b6fec1480cb..971bf0e736347428b9c221f6764bf204e6df36cc 100644 (file)
--- a/tests/progs/slapd-tester.c
+++ b/tests/progs/slapd-tester.c
@@ -11,14 +11,12 @@
 
 #include <ac/ctype.h>
 #include <ac/dirent.h>
+#include <ac/param.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/unistd.h>
 #include <ac/wait.h>
 
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
 
 #include "ldap_defaults.h"