hurd: Fix build

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

(cherry picked from commit d10fbdec84b5cbe2e51e0b74f41716dcc2c7035d)

diff --git a/bin/dnssec/dnssec-cds.c b/bin/dnssec/dnssec-cds.c
index 404fa7187d8d3051a8f78beb72e2ef137ea77626..59aa45ee5f7b6f05f94c64786f3299653cd29c9e 100644 (file)
--- a/bin/dnssec/dnssec-cds.c
+++ b/bin/dnssec/dnssec-cds.c
@@ -28,6 +28,7 @@
 #include <isc/file.h>
 #include <isc/hash.h>
 #include <isc/mem.h>
+#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/serial.h>
 #include <isc/string.h>
@@ -61,10 +62,6 @@
 
 #include "dnssectool.h"
 
-#ifndef PATH_MAX
-#define PATH_MAX 1024   /* WIN32, and others don't define this. */
-#endif
-
 const char *program = "dnssec-cds";
 int verbose;
 

diff --git a/bin/dnssec/dnssec-dsfromkey.c b/bin/dnssec/dnssec-dsfromkey.c
index dc439ecc84402b2a2ce87c5c0c8e34a45de90a2b..ab18eef3797edb3e359e4100f06e8ff1b4f6ec62 100644 (file)
--- a/bin/dnssec/dnssec-dsfromkey.c
+++ b/bin/dnssec/dnssec-dsfromkey.c
@@ -21,6 +21,7 @@
 #include <isc/commandline.h>
 #include <isc/hash.h>
 #include <isc/mem.h>
+#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/string.h>
 #include <isc/util.h>
@@ -49,10 +50,6 @@
 
 #include "dnssectool.h"
 
-#ifndef PATH_MAX
-#define PATH_MAX 1024   /* WIN32, and others don't define this. */
-#endif
-
 const char *program = "dnssec-dsfromkey";
 int verbose;
 

diff --git a/bin/dnssec/dnssec-importkey.c b/bin/dnssec/dnssec-importkey.c
index 67f4137c27d2ecec0d8c43999d3f9441d1498f5b..3354c9dfd412fbdd9dab58d0bc9f96f2bd51a43a 100644 (file)
--- a/bin/dnssec/dnssec-importkey.c
+++ b/bin/dnssec/dnssec-importkey.c
@@ -20,6 +20,7 @@
 #include <isc/commandline.h>
 #include <isc/hash.h>
 #include <isc/mem.h>
+#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/string.h>
 #include <isc/util.h>
@@ -48,10 +49,6 @@
 
 #include "dnssectool.h"
 
-#ifndef PATH_MAX
-#define PATH_MAX 1024   /* WIN32, and others don't define this. */
-#endif
-
 const char *program = "dnssec-importkey";
 int verbose;
 

diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index cce743913d98c95c85636efd9701c956b2beaf70..a2f449eeecdda75d2be5d0bf4aea60fc16775447 100644 (file)
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -44,6 +44,7 @@
 #include <isc/mem.h>
 #include <isc/mutex.h>
 #include <isc/os.h>
+#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/random.h>
 #include <isc/rwlock.h>
@@ -88,10 +89,6 @@
 
 #include "dnssectool.h"
 
-#ifndef PATH_MAX
-#define PATH_MAX 1024   /* WIN32, and others don't define this. */
-#endif
-
 const char *program = "dnssec-signzone";
 int verbose;
 

diff --git a/bin/dnssec/dnssectool.h b/bin/dnssec/dnssectool.h
index aeae3a18b34c218a8d523941df5798f65a8190f8..e4248a03cd4fb13f95688bcb32c9d14a8d3f9776 100644 (file)
--- a/bin/dnssec/dnssectool.h
+++ b/bin/dnssec/dnssectool.h
@@ -17,6 +17,7 @@
 #include <stdbool.h>
 
 #include <isc/log.h>
+#include <isc/platform.h>
 #include <isc/stdtime.h>
 #include <dns/rdatastruct.h>
 #include <dst/dst.h>

diff --git a/bin/named/server.c b/bin/named/server.c
index 6e54dcaeb42ed3d0cf97b3bcea934cfad1c046c9..4314fd1ebc8d3f761fd6e98322e0a1154f5b9bd8 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -137,10 +137,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/dns/view.c b/lib/dns/view.c
index 8a171e76c18fbd934b0f1cda33a93fffc039c3e7..31a979294c1c117b9a462841ba2afa48291128da 100644 (file)
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -24,6 +24,7 @@
 #include <isc/file.h>
 #include <isc/hash.h>
 #include <isc/lex.h>
+#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/stats.h>
 #include <isc/string.h>                /* Required for HP/UX (and others?) */
@@ -1970,10 +1971,6 @@ dns_view_untrust(dns_view_t *view, const dns_name_t *keyname,
  * fit in 'buflen'.
  */
 
-#ifndef PATH_MAX
-#define PATH_MAX 1024
-#endif
-
 static isc_result_t
 nz_legacy(const char *directory, const char *viewname,
          const char *suffix, char *buffer, size_t buflen)

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 2312ff0a9dc4b666128e8362ec66f8d9690362af..fe7978d277d5b5d0848566445a1aa75e077cab0c 100644 (file)
--- a/lib/isc/log.c
+++ b/lib/isc/log.c
@@ -27,6 +27,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>
@@ -45,10 +46,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 3b0c5632c86cceedb8f5d9c5409bf32b2e594e01..acb227b0e3085e503c8ef807c4507fe7e9b6fb66 100644 (file)
--- a/lib/isc/unix/file.c
+++ b/lib/isc/unix/file.c
@@ -65,6 +65,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>
@@ -699,9 +700,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];

diff --git a/lib/isc/win32/file.c b/lib/isc/win32/file.c
index e87fe51832bb5b313e6984f77f16db396ee47e44..a79a13164cfe3e9e01ae8bdf3756790e854f9099 100644 (file)
--- a/lib/isc/win32/file.c
+++ b/lib/isc/win32/file.c
@@ -28,6 +28,7 @@
 #include <isc/file.h>
 #include <isc/md.h>
 #include <isc/mem.h>
+#include <isc/platform.h>
 #include <isc/print.h>
 #include <isc/random.h>
 #include <isc/result.h>
@@ -776,9 +777,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/win32/include/isc/dir.h b/lib/isc/win32/include/isc/dir.h
index 7ec8e0c1e96c245d592e13275c2e168ffba1e11d..5e60d16b4fe43d2622a248c1393aa3bd08e3b29c 100644 (file)
--- a/lib/isc/win32/include/isc/dir.h
+++ b/lib/isc/win32/include/isc/dir.h
@@ -17,18 +17,11 @@
 #include <stdlib.h>
 
 #include <isc/lang.h>
+#include <isc/platform.h>
 #include <isc/result.h>
 
-#ifndef NAME_MAX
-#define NAME_MAX _MAX_FNAME
-#endif
-
-#ifndef PATH_MAX
-#define PATH_MAX _MAX_PATH
-#endif
-
 typedef struct {
-       char            name[NAME_MAX];
+       char            name[NAME_MAX];
        unsigned int    length;
        WIN32_FIND_DATA find_data;
 } isc_direntry_t;

diff --git a/lib/isc/win32/include/isc/platform.h.in b/lib/isc/win32/include/isc/platform.h.in
index 4bab6a476687b7cd0c5148378670fbbaf837a97b..d9fe79de8871176baf31f87777079f1bb3852070 100644 (file)
--- a/lib/isc/win32/include/isc/platform.h.in
+++ b/lib/isc/win32/include/isc/platform.h.in
@@ -48,9 +48,9 @@ typedef uint32_t socklen_t;
 
 #define __attribute__(attribute) /* do nothing */
 
-/***
- *** Network.
- ***/
+#ifndef NAME_MAX
+#define NAME_MAX _MAX_FNAME
+#endif
 
 #ifndef PATH_MAX
 #define PATH_MAX _MAX_PATH