diff --git a/bin/dnssec/dnssectool.h b/bin/dnssec/dnssectool.h index 3e88e2959e..4ba56d10e0 100644 --- a/bin/dnssec/dnssectool.h +++ b/bin/dnssec/dnssectool.h @@ -17,14 +17,11 @@ #include #include +#include #include #include #include -#ifndef PATH_MAX -#define PATH_MAX 1024 /* WIN32, and others don't define this. */ -#endif - /*! verbosity: set by -v and -q option in each program, defined in dnssectool.c */ extern int verbose; extern bool quiet; diff --git a/bin/named/server.c b/bin/named/server.c index bf4f4a0ebc..337471dd9d 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -136,10 +136,6 @@ #define dumpzone dumpzone_file #endif /* HAVE_LMDB */ -#ifndef PATH_MAX -#define PATH_MAX 1024 -#endif - #ifndef SIZE_MAX #define SIZE_MAX ((size_t)-1) #endif diff --git a/lib/dns/gen.c b/lib/dns/gen.c index 201429f132..99f0395b3a 100644 --- a/lib/dns/gen.c +++ b/lib/dns/gen.c @@ -26,6 +26,8 @@ #include +#include + #include #include #include @@ -142,10 +144,6 @@ static const char copyright[] = #define TYPECLASSFMT "%" STR(TYPECLASSLEN) "[-0-9a-z]_%d" #define ATTRIBUTESIZE 256 -#ifndef PATH_MAX -#define PATH_MAX 1024 -#endif - static struct cc { struct cc *next; int rdclass; diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in index 90b9a2ee36..0a16b88739 100644 --- a/lib/isc/include/isc/platform.h.in +++ b/lib/isc/include/isc/platform.h.in @@ -32,6 +32,24 @@ #define ISC_STRERRORSIZE 128 +/*** + *** System limitations + ***/ + +#include + +#ifndef NAME_MAX +#define NAME_MAX 256 +#endif + +#ifndef PATH_MAX +#define PATH_MAX 1024 +#endif + +#ifndef IOV_MAX +#define IOV_MAX 1024 +#endif + /*** *** Miscellaneous. ***/ diff --git a/lib/isc/log.c b/lib/isc/log.c index 6e825a78b0..0af599f8c2 100644 --- a/lib/isc/log.c +++ b/lib/isc/log.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -43,10 +44,6 @@ */ #define LOG_BUFFER_SIZE (8 * 1024) -#ifndef PATH_MAX -#define PATH_MAX 1024 /* WIN32 and others don't define this. */ -#endif - /*! * This is the structure that holds each named channel. A simple linked * list chains all of the channels together, so an individual channel is diff --git a/lib/isc/unix/file.c b/lib/isc/unix/file.c index 65aebdf24f..d2f24825a9 100644 --- a/lib/isc/unix/file.c +++ b/lib/isc/unix/file.c @@ -63,6 +63,7 @@ #include #include #include +#include #include #include #include @@ -696,9 +697,6 @@ isc_file_munmap(void *addr, size_t len) { } #define DISALLOW "\\/ABCDEFGHIJKLMNOPQRSTUVWXYZ" -#ifndef PATH_MAX -#define PATH_MAX 1024 -#endif static isc_result_t digest2hex(unsigned char *digest, unsigned int digestlen, diff --git a/lib/isc/unix/include/isc/dir.h b/lib/isc/unix/include/isc/dir.h index 5a147b89f3..67607970f3 100644 --- a/lib/isc/unix/include/isc/dir.h +++ b/lib/isc/unix/include/isc/dir.h @@ -18,16 +18,9 @@ #include #include +#include #include -#ifndef NAME_MAX -#define NAME_MAX 256 -#endif - -#ifndef PATH_MAX -#define PATH_MAX 1024 -#endif - /*% Directory Entry */ typedef struct isc_direntry { char name[NAME_MAX];