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

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)

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

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

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

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

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 */

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)

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"
 

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 )

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 <ac/param.h>
-#include <sys/param.h>
-#endif
 
 #include "lutil_sha1.h"
 

servers/slapd/attr.c

@@ -19,9 +19,7 @@
 #include <ac/string.h>
 #include <ac/time.h>
 
-#ifdef HAVE_SYS_PARAM_H
+#include <ac/param.h>
-#include <sys/param.h>
-#endif
 
 #include "ldap_pvt.h"
 #include "slap.h"

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 *

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"
 

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"

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>

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

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

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>
 

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"