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 ae83e012acd8b72e6230b5a0f93546b3eef7fb44..c27b963bda9f3d9d8ad0870995d9a527b3b6af63 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]
+
 2690.  [bug]           win32: fix isc_thread_key_getspecific() prototype.
                        [RT #20315]
 
@@ -93,7 +97,7 @@
                        removed_orphaned_ds(). [RT #19507]
 
 2589.  [bug]           dns_db_unregister() failed to clear '*dbimp'.
-                       [RT #19626]
+                       [RT #19626]
 
 2586.  [bug]           Missing cleanup of SIG rdataset in searching a DLZ DB
                        or SDB. [RT #19577]
@@ -182,8 +186,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]
@@ -219,7 +223,7 @@
 2509.  [bug]           Specifying a fixed query source port was broken.
                        [RT #19051]
 
-2506.  [port]          solaris: Check at configure time if 
+2506.  [port]          solaris: Check at configure time if
                        hack_shutup_pthreadonceinit is needed. [RT #19037]
 
 2505.  [port]          Treat amd64 similarly to x86_64 when determining
@@ -278,7 +282,7 @@
 
 2473.  [port]          linux: raise the limit on open files to the possible
                        maximum value before spawning threads; 'files'
-                       specified in named.conf doesn't seem to work with
+                       specified in named.conf doesn't seem to work with
                        threads as expected. [RT #18784]
 
 2472.  [port]          linux: check the number of available cpu's before
@@ -301,7 +305,7 @@
 2465.  [bug]           Adb's handling of lame addresses was different
                        for IPv4 and IPv6. [RT #18738]
 
-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
@@ -486,7 +490,7 @@
 2380.  [bug]           dns_view_find() was not returning NXDOMAIN/NXRRSET
                        proofs which, in turn, caused validation failures
                        for insecure zones immediately below a secure zone
-                       the server was authoritative for. [RT #18112] 
+                       the server was authoritative for. [RT #18112]
 
 2379.  [contrib]       queryperf/gen-data-queryperf.py: removed redundant
                        TLDs and supported RRs with TTLs [RT #17972]

diff --git a/lib/isc/win32/include/isc/stat.h b/lib/isc/win32/include/isc/stat.h
index 1834bec4a23729f5c2151ca544bb95ff2c8d9dc7..fe7c3454c6f948afee10e2d17376e1b0a0644eff 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.5 2004/03/05 05:12:05 marka Exp $ */
+/* $Id: stat.h,v 1.5.18.1 2009/10/01 05:25:44 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