From 4cc712db5378592205e4113f6e73da9bfd189ecc Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Mon, 1 Nov 1999 17:21:24 +0000 Subject: [PATCH] Add to wrap --- acconfig.h | 2 -- clients/fax500/main.c | 4 +--- clients/gopher/go500.c | 5 +---- clients/gopher/go500gw.c | 5 +---- clients/mail500/main.c | 5 +---- include/ac/param.h | 26 ++++++++++++++++++++++++++ include/portable.h.in | 2 -- libraries/libldap/charset.c | 4 +--- libraries/libldap/open.c | 5 +---- libraries/liblutil/sha1.c | 4 +--- servers/slapd/attr.c | 4 +--- servers/slapd/lock.c | 5 ++--- servers/slurpd/lock.c | 4 +--- servers/slurpd/replog.c | 5 +---- servers/slurpd/slurp.h | 4 +--- tests/progs/slapd-addel.c | 5 +---- tests/progs/slapd-read.c | 5 +---- tests/progs/slapd-search.c | 4 +--- tests/progs/slapd-tester.c | 4 +--- 19 files changed, 43 insertions(+), 59 deletions(-) create mode 100644 include/ac/param.h diff --git a/acconfig.h b/acconfig.h index 60cfe22420..cc19afa69a 100644 --- 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 b94a1a6215..440e7d4167 100644 --- a/clients/fax500/main.c +++ b/clients/fax500/main.c @@ -19,6 +19,7 @@ #include #include +#include #include #include #include @@ -28,9 +29,6 @@ #include #include -#ifdef HAVE_SYS_PARAM_H -#include -#endif #ifdef HAVE_SYS_RESOURCE_H #include #endif diff --git a/clients/gopher/go500.c b/clients/gopher/go500.c index ff3bb2254e..aebc0ce667 100644 --- a/clients/gopher/go500.c +++ b/clients/gopher/go500.c @@ -26,12 +26,9 @@ #include #include +#include #include -#ifdef HAVE_SYS_PARAM_H -#include -#endif - #ifdef HAVE_SYS_RESOURCE_H #include #endif diff --git a/clients/gopher/go500gw.c b/clients/gopher/go500gw.c index 21939f3ca5..2d88e75c40 100644 --- a/clients/gopher/go500gw.c +++ b/clients/gopher/go500gw.c @@ -26,12 +26,9 @@ #include #include +#include #include -#ifdef HAVE_SYS_PARAM_H -#include -#endif - #ifdef HAVE_SYS_RESOURCE_H #include #endif diff --git a/clients/mail500/main.c b/clients/mail500/main.c index 064ed64c34..4e40d1210c 100644 --- a/clients/mail500/main.c +++ b/clients/mail500/main.c @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -32,10 +33,6 @@ #include -#ifdef HAVE_SYS_PARAM_H -#include -#endif - #ifdef HAVE_SYS_RESOURCE_H #include #endif diff --git a/include/ac/param.h b/include/ac/param.h new file mode 100644 index 0000000000..b339e04bc2 --- /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 +#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 252ddb1ddf..88c86ec782 100644 --- 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 7d85f5ad79..1f348dc209 100644 --- a/libraries/libldap/charset.c +++ b/libraries/libldap/charset.c @@ -18,13 +18,11 @@ #include +#include #include #include #include -#ifdef HAVE_SYS_PARAM_H -#include -#endif #include "ldap-int.h" diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c index 1551ec66f3..8a3be3ac49 100644 --- a/libraries/libldap/open.c +++ b/libraries/libldap/open.c @@ -16,14 +16,11 @@ #include +#include #include #include #include -#ifdef HAVE_SYS_PARAM_H -#include -#endif - #include "ldap-int.h" int ldap_open_defconn( LDAP *ld ) diff --git a/libraries/liblutil/sha1.c b/libraries/liblutil/sha1.c index a7670f93d8..2bc0ba075c 100644 --- 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 -#if defined(HAVE_SYS_PARAM_H) -#include -#endif +#include #include "lutil_sha1.h" diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c index 7fb63cf9de..546e9583b1 100644 --- a/servers/slapd/attr.c +++ b/servers/slapd/attr.c @@ -19,9 +19,7 @@ #include #include -#ifdef HAVE_SYS_PARAM_H -#include -#endif +#include #include "ldap_pvt.h" #include "slap.h" diff --git a/servers/slapd/lock.c b/servers/slapd/lock.c index e9f5fda164..15cc748e02 100644 --- a/servers/slapd/lock.c +++ b/servers/slapd/lock.c @@ -9,6 +9,7 @@ #include +#include #include #include #include @@ -17,9 +18,7 @@ #ifdef HAVE_SYS_FILE_H #include #endif -#ifdef HAVE_SYS_PARAM_H -#include -#endif + #include "slap.h" FILE * diff --git a/servers/slurpd/lock.c b/servers/slurpd/lock.c index eb957c288b..c863d4b9e8 100644 --- a/servers/slurpd/lock.c +++ b/servers/slurpd/lock.c @@ -19,6 +19,7 @@ #include +#include #include #include #include @@ -27,9 +28,6 @@ #ifdef HAVE_SYS_FILE_H #include #endif -#ifdef HAVE_SYS_PARAM_H -#include -#endif #include "slurp.h" diff --git a/servers/slurpd/replog.c b/servers/slurpd/replog.c index f4c738061a..d13ea4bb81 100644 --- a/servers/slurpd/replog.c +++ b/servers/slurpd/replog.c @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -28,10 +29,6 @@ #include -#ifdef HAVE_SYS_PARAM_H -#include -#endif - #include #include "slurp.h" diff --git a/servers/slurpd/slurp.h b/servers/slurpd/slurp.h index 19a6c9d58b..26368bd487 100644 --- a/servers/slurpd/slurp.h +++ b/servers/slurpd/slurp.h @@ -21,13 +21,11 @@ #endif #include +#include #include #include #include -#ifdef HAVE_SYS_PARAM_H -#include -#endif #include #include diff --git a/tests/progs/slapd-addel.c b/tests/progs/slapd-addel.c index 3497439af3..287dbfdae5 100644 --- a/tests/progs/slapd-addel.c +++ b/tests/progs/slapd-addel.c @@ -10,15 +10,12 @@ #include #include +#include #include #include #include #include -#ifdef HAVE_SYS_PARAM_H -#include -#endif - #include #define LOOPS 100 diff --git a/tests/progs/slapd-read.c b/tests/progs/slapd-read.c index 0446534f0d..6fa0b905b6 100644 --- a/tests/progs/slapd-read.c +++ b/tests/progs/slapd-read.c @@ -10,15 +10,12 @@ #include #include +#include #include #include #include #include -#ifdef HAVE_SYS_PARAM_H -#include -#endif - #include #define LOOPS 100 diff --git a/tests/progs/slapd-search.c b/tests/progs/slapd-search.c index fc5745e797..d831e348e6 100644 --- a/tests/progs/slapd-search.c +++ b/tests/progs/slapd-search.c @@ -10,14 +10,12 @@ #include #include +#include #include #include #include #include -#ifdef HAVE_SYS_PARAM_H -#include -#endif #include diff --git a/tests/progs/slapd-tester.c b/tests/progs/slapd-tester.c index d1a44e79b1..971bf0e736 100644 --- a/tests/progs/slapd-tester.c +++ b/tests/progs/slapd-tester.c @@ -11,14 +11,12 @@ #include #include +#include #include #include #include #include -#ifdef HAVE_SYS_PARAM_H -#include -#endif #include "ldap_defaults.h" -- 2.39.5