Fixup Windows build after strerr changes

diff --git a/lib/isc/include/isc/strerr.h b/lib/isc/include/isc/strerr.h
index 40022ecd6d51ec7e9fe7a49b57625e0ee2aecb1c..e3e0304dabd1862d6291fd96ab8e566816d45335 100644 (file)
--- a/lib/isc/include/isc/strerr.h
+++ b/lib/isc/include/isc/strerr.h
@@ -17,7 +17,7 @@
 
 #include <string.h>
 
-#if _GNU_SOURCE
+#if defined(strerror_r)
 #undef strerror_r
-#define strerror_r isc_string_strerror_r
 #endif
+#define strerror_r isc_string_strerror_r

diff --git a/lib/isc/string.c b/lib/isc/string.c
index b1e42a0b571ef1970293945a2fdcac8574e4f848..46e5303166d67d277cfe725aa58bd5ab68dd818b 100644 (file)
--- a/lib/isc/string.c
+++ b/lib/isc/string.c
@@ -44,8 +44,8 @@
 
 #ifdef _GNU_SOURCE
 #undef _GNU_SOURCE
-#include <string.h>
 #endif
+#include <string.h>
 
 #include "isc/string.h"  // IWYU pragma: keep
 
@@ -109,5 +109,9 @@ isc_string_strlcat(char *dst, const char *src, size_t size)
 
 int
 isc_string_strerror_r(int errnum, char *buf, size_t buflen) {
+#if defined(_WIN32) || defined(_WIN64)
+       return (strerror_s(buf, buflen, errnum));
+#else
        return (strerror_r(errnum, buf, buflen));
+#endif
 }

diff --git a/lib/isc/win32/errno2result.c b/lib/isc/win32/errno2result.c
index d24a1268b1f64b847c9f545ec04099b7bf45b59e..d09fc2b233f4cacb84c3e8d4ee676e6a82c32109 100644 (file)
--- a/lib/isc/win32/errno2result.c
+++ b/lib/isc/win32/errno2result.c
@@ -17,6 +17,7 @@
 
 #include "errno2result.h"
 #include <isc/result.h>
+#include <isc/strerr.h>
 #include <isc/string.h>
 #include <isc/util.h>
 

diff --git a/lib/isc/win32/include/isc/platform.h.in b/lib/isc/win32/include/isc/platform.h.in
index eea970e6a9a7ec53f0e37efadc9a5b7ffcc13096..a0fc5c644a703a461ce2c7eea656967078480f67 100644 (file)
--- a/lib/isc/win32/include/isc/platform.h.in
+++ b/lib/isc/win32/include/isc/platform.h.in
@@ -28,7 +28,6 @@
 #if defined(_WIN32) || defined(_WIN64)
 /* We are on Windows */
 # define strtok_r strtok_s
-# define strerror_r(errnum, buf, buflen) strerror_s(buf, buflen, errnum)
 
 #define ISC_STRERRORSIZE 128
 

diff --git a/lib/isc/win32/interfaceiter.c b/lib/isc/win32/interfaceiter.c
index 3272c89ecf13eb5e94c0cef9a7122414c7374d5f..da6d282b0494425c39813724d9bd6d7e889f1ac9 100644 (file)
--- a/lib/isc/win32/interfaceiter.c
+++ b/lib/isc/win32/interfaceiter.c
@@ -31,7 +31,6 @@
 #include <isc/result.h>
 #include <isc/strerr.h>
 #include <isc/string.h>
-#include <isc/strerror.h>
 #include <isc/types.h>
 #include <isc/util.h>
 

diff --git a/lib/isc/win32/libisc.vcxproj.filters.in b/lib/isc/win32/libisc.vcxproj.filters.in
index ff1c035ac23aa11c693fb5d5954c05e06e94c2e5..bce90661fe3b7b682fd2b2d0aae78b457f407d9d 100644 (file)
--- a/lib/isc/win32/libisc.vcxproj.filters.in
+++ b/lib/isc/win32/libisc.vcxproj.filters.in
@@ -449,9 +449,6 @@
     <ClCompile Include="stdtime.c">
       <Filter>Win32 Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="strerror.c">
-      <Filter>Win32 Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="syslog.c">
       <Filter>Win32 Source Files</Filter>
     </ClCompile>
@@ -538,12 +535,6 @@
     <ClCompile Include="..\httpd.c">
       <Filter>Library Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\inet_ntop.c">
-      <Filter>Library Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\inet_pton.c">
-      <Filter>Library Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\iterated_hash.c">
       <Filter>Library Source Files</Filter>
     </ClCompile>

diff --git a/lib/isc/win32/libisc.vcxproj.in b/lib/isc/win32/libisc.vcxproj.in
index 376ab0cf0c0a650168f645e91225b4525f1eb2bb..c32f5c8be7f81e7f41d8724546f4d1fc089b77ca 100644 (file)
--- a/lib/isc/win32/libisc.vcxproj.in
+++ b/lib/isc/win32/libisc.vcxproj.in
@@ -437,8 +437,6 @@ copy InstallFiles ..\Build\Release\
     <ClCompile Include="..\hmacsha.c" />
     <ClCompile Include="..\ht.c" />
     <ClCompile Include="..\httpd.c" />
-    <ClCompile Include="..\inet_ntop.c" />
-    <ClCompile Include="..\inet_pton.c" />
     <ClCompile Include="..\iterated_hash.c" />
     <ClCompile Include="..\lex.c" />
     <ClCompile Include="..\lfsr.c" />
@@ -497,7 +495,6 @@ copy InstallFiles ..\Build\Release\
     <ClCompile Include="socket.c" />
     <ClCompile Include="stdio.c" />
     <ClCompile Include="stdtime.c" />
-    <ClCompile Include="strerror.c" />
     <ClCompile Include="syslog.c" />
     <ClCompile Include="thread.c" />
     <ClCompile Include="time.c" />

diff --git a/lib/isc/win32/net.c b/lib/isc/win32/net.c
index 7328f8e54c67620be5dc8ae4a6c05b2614501a0f..3ae2e4c3e6fefba7d23fc8683d155bac8a903b95 100644 (file)
--- a/lib/isc/win32/net.c
+++ b/lib/isc/win32/net.c
@@ -19,7 +19,7 @@
 #include <isc/msgs.h>
 #include <isc/net.h>
 #include <isc/once.h>
-#include <isc/strerror.h>
+#include <isc/strerr.h>
 #include <isc/string.h>
 #include <isc/util.h>
 

diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index ffcc0cc9e14e91ce77149b23a6e6f3b5eda8385a..9add3748812880395f394620a150909c7307b942 100644 (file)
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -62,7 +62,7 @@
 #include <isc/region.h>
 #include <isc/socket.h>
 #include <isc/stats.h>
-#include <isc/strerror.h>
+#include <isc/strerr.h>
 #include <isc/string.h>
 #include <isc/syslog.h>
 #include <isc/task.h>