From: Ondřej Surý <ondrej@sury.org>
Date: Tue, 12 Nov 2019 08:36:08 +0000 (+0100)
Subject: Cleanup the {PATH,NAME}_MAX stray #ifdefs
X-Git-Tag: v9.15.6~15^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd80969b11bb0b9739381f6da938167fe05c3084;p=thirdparty%2Fbind9.git

Cleanup the {PATH,NAME}_MAX stray #ifdefs
---

diff --git a/lib/dns/view.c b/lib/dns/view.c
index 23767d72f8b..a0b86b9aaf6 100644
--- 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 46992691c37..668f4014609 100644
--- 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 7ec8e0c1e96..6427742041b 100644
--- 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 4bab6a47668..cce2bb513e1 100644
--- 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
 
 /*