2697. [port] win32: ensure that S_IFMT, S_IFDIR, S_IFCHR and

                        S_IFREG are defined after including <isc/stat.h>.
                        [RT #20309]

diff --git a/CHANGES b/CHANGES
index a76bdc9d004cd044b9ebd9b89834d1355cd27f90..20ec3d64de0d3804a59fffcec00c3071b7b33cb1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+2697.  [port]          win32: ensure that S_IFMT, S_IFDIR, S_IFCHR and
+                       S_IFREG are defined after including <isc/stat.h>.
+                       [RT #20309]
+
 2696.  [bug]           named failed to successfully process some valid
                        acl constructs. [RT #20308]
 
@@ -230,8 +234,8 @@
 2529.  [cleanup]       Upgrade libtool to silence complaints from recent
                        version of autoconf. [RT #18657]
 
-2528.   [cleanup]       Silence spurious configure warning about
-                        --datarootdir [RT #19096]
+2528.   [cleanup]      Silence spurious configure warning about
+                       --datarootdir [RT #19096]
 
 2527.  [bug]           named could reuse cache on reload with
                        enabling/disabling validation. [RT #19119]
@@ -383,7 +387,7 @@
 2464.  [port]          linux: check that a capability is present before
                        trying to set it. [RT #18135]
 
-2463.   [port]          linux: POSIX doesn't include the IPv6 Advanced Socket
+2463.  [port]          linux: POSIX doesn't include the IPv6 Advanced Socket
                        API and glibc hides parts of the IPv6 Advanced Socket
                        API as a result.  This is stupid as it breaks how the
                        two halves (Basic and Advanced) of the IPv6 Socket API
@@ -440,7 +444,7 @@
 
 2442.  [bug]           A lock could be destroyed twice. [RT# 18626]
 
-2441.   [bug]           isc_radix_insert() could copy radix tree nodes
+2441.  [bug]           isc_radix_insert() could copy radix tree nodes
                        incompletely. [RT #18573]
 
 2440.   [bug]          named-checkconf used an incorrect test to determine
@@ -555,9 +559,9 @@
 
 2407.  [port]          hpux: test for sys/dyntune.h. [RT #18421]
 
-2405.   [cleanup]       The default value for dnssec-validation was changed to
-                        "yes" in 9.5.0-P1 and all subsequent releases; this
-                        was inadvertently omitted from CHANGES at the time.
+2405.  [cleanup]       The default value for dnssec-validation was changed to
+                       "yes" in 9.5.0-P1 and all subsequent releases; this
+                       was inadvertently omitted from CHANGES at the time.
 
 2404.  [port]          hpux: files unlimited support.
 

diff --git a/lib/isc/win32/include/isc/stat.h b/lib/isc/win32/include/isc/stat.h
index 2638a916ddc8bb1de295ae08b82127a25304fac8..17573888ee1576734f1542d82bc3b65659196f67 100644 (file)
--- a/lib/isc/win32/include/isc/stat.h
+++ b/lib/isc/win32/include/isc/stat.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stat.h,v 1.7 2007/06/19 23:47:20 tbox Exp $ */
+/* $Id: stat.h,v 1.7.128.1 2009/10/01 05:19:35 marka Exp $ */
 
 #ifndef ISC_STAT_H
 #define ISC_STAT_H 1
@@ -36,6 +36,19 @@
 #define S_IROTH _S_IREAD       /* Other read permission */
 #define S_IWOTH _S_IWRITE      /* Other write permission */
 
+#ifndef S_IFMT
+# define S_IFMT   _S_IFMT
+#endif
+#ifndef S_IFDIR
+# define S_IFDIR  _S_IFDIR
+#endif
+#ifndef S_IFCHR
+# define S_IFCHR  _S_IFCHR
+#endif
+#ifndef S_IFREG
+# define S_IFREG  _S_IFREG
+#endif
+
 #ifndef S_ISDIR
 # define S_ISDIR(m)    (((m) & S_IFMT) == S_IFDIR)
 #endif