Cleanup the {PATH,NAME}_MAX stray #ifdefs

diff --git a/lib/dns/view.c b/lib/dns/view.c
index 23767d72f8ba9924e78a797e4e18a37c416c9b56..a0b86b9aaf65965883e52e16eee9dc11a4fc1c7d 100644 (file)
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -1934,10 +1934,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/win32/file.c b/lib/isc/win32/file.c
index 46992691c374261b6a2f6784f8a12f62ec8fcb58..668f4014609c766e539814c192dd4692ac4317d9 100644 (file)
--- a/lib/isc/win32/file.c
+++ b/lib/isc/win32/file.c
@@ -25,6 +25,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>
@@ -772,9 +773,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..6427742041b9ac7b49f03641b794cbb4c34f52d4 100644 (file)
--- a/lib/isc/win32/include/isc/dir.h
+++ b/lib/isc/win32/include/isc/dir.h
@@ -17,16 +17,9 @@
 #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];
        unsigned int    length;

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