hurd: Fix build

Move PATH_MAX, NAME_MAX, IOV_MAX default definitions to the common
<isc/platform.h>.

diff --git a/bin/dnssec/dnssectool.h b/bin/dnssec/dnssectool.h
index 3e88e2959eb57c6ec30ea897453723b519a6620a..4ba56d10e0800192d2e773e4eaffdddd599f9970 100644 (file)
--- a/bin/dnssec/dnssectool.h
+++ b/bin/dnssec/dnssectool.h
@@ -17,14 +17,11 @@
 #include <stdbool.h>
 
 #include <isc/log.h>
+#include <isc/platform.h>
 #include <isc/stdtime.h>
 #include <dns/rdatastruct.h>
 #include <dst/dst.h>
 
-#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 bf4f4a0ebc0552c9a17ba761980ba8308d255bed..337471dd9dd8a7915ab0cea2ab24f203d83ef67f 100644 (file)
--- 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 201429f132f0c51ab542c0d9bb1968f58b7802db..99f0395b3a3b6e96b18f6cec2205ae426835d14e 100644 (file)
--- a/lib/dns/gen.c
+++ b/lib/dns/gen.c
@@ -26,6 +26,8 @@
 
 #include <sys/types.h>
 
+#include <isc/platform.h>
+
 #include <ctype.h>
 #include <limits.h>
 #include <stdint.h>
@@ -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 90b9a2ee3644e948b6eecf212d67b748b57e088a..0a16b887391e94d2a5e0bc2aa9ddd7b34e9a8645 100644 (file)
--- 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 <limits.h>
+
+#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 6e825a78b0c73401a42773aee21e1460e6dc106a..0af599f8c2a60533ad13d55e39cf36e0a4e08aaf 100644 (file)
--- a/lib/isc/log.c
+++ b/lib/isc/log.c
@@ -25,6 +25,7 @@
 #include <isc/log.h>
 #include <isc/magic.h>
 #include <isc/mem.h>
+#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/stat.h>
 #include <isc/stdio.h>
@@ -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 65aebdf24fe79de0db921d584c7ab77039a09d2a..d2f24825a9cae7da67e9108759c0ac6e50677c91 100644 (file)
--- a/lib/isc/unix/file.c
+++ b/lib/isc/unix/file.c
@@ -63,6 +63,7 @@
 #include <isc/log.h>
 #include <isc/md.h>
 #include <isc/mem.h>
+#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/random.h>
 #include <isc/string.h>
@@ -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 5a147b89f3a37f5cfef3f534b42bf992d395bff5..67607970f3f26ef5ce06bf0e23b6fc2199d6f2da 100644 (file)
--- a/lib/isc/unix/include/isc/dir.h
+++ b/lib/isc/unix/include/isc/dir.h
@@ -18,16 +18,9 @@
 #include <dirent.h>
 
 #include <isc/lang.h>
+#include <isc/platform.h>
 #include <isc/result.h>
 
-#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];