- Fix warning for windres on resource files due to redefinition.

diff --git a/doc/Changelog b/doc/Changelog
index 2fb11dadcc5a221089205f5388b7e9abcb680d9c..e57943241e91df9b7d88a110cd440b7159c0b6eb 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 17 January 2024: Wouter
        - Update workflow for ports to use newer openssl on windows compile.
+       - Fix warning for windres on resource files due to redefinition.
 
 16 January 2024: Wouter
        - Fix to link with libssp for libcrypto and getaddrinfo check for

diff --git a/winrc/rsrc_anchorupd.rc b/winrc/rsrc_anchorupd.rc
index 2419bfad5c403b0e6f2590d808232679b95f8ba3..ac5167866c3c1327460468bd3e791beddf316b08 100644 (file)
--- a/winrc/rsrc_anchorupd.rc
+++ b/winrc/rsrc_anchorupd.rc
@@ -1,8 +1,8 @@
 /*
   Unbound resource file for windows.  For use with windres
 */
-#include "winver.h"
 #include "config.h"
+#include "winver.h"
 
 1 ICON "winrc/combined.ico"
 

diff --git a/winrc/rsrc_svcinst.rc b/winrc/rsrc_svcinst.rc
index cb325f4c493510073bf1a2b7175f95d56527d77b..0ed113695eb31c25e564e42366a7f81236840661 100644 (file)
--- a/winrc/rsrc_svcinst.rc
+++ b/winrc/rsrc_svcinst.rc
@@ -1,8 +1,8 @@
 /*
   Unbound resource file for windows.  For use with windres
 */
-#include "winver.h"
 #include "config.h"
+#include "winver.h"
 
 1 ICON "winrc/combined.ico"
 

diff --git a/winrc/rsrc_svcuninst.rc b/winrc/rsrc_svcuninst.rc
index ecff8dcd385674cccb56d42a52a255284f302aac..86bed5e89816fcf25fb50006eb5c41b5ab207150 100644 (file)
--- a/winrc/rsrc_svcuninst.rc
+++ b/winrc/rsrc_svcuninst.rc
@@ -1,8 +1,8 @@
 /*
   Unbound resource file for windows.  For use with windres
 */
-#include "winver.h"
 #include "config.h"
+#include "winver.h"
 
 1 ICON "winrc/combined.ico"
 

diff --git a/winrc/rsrc_unbound.rc b/winrc/rsrc_unbound.rc
index cc05d0eeb51dace7fd784a3aeb13ec290305924e..d6db15eeb4153b66cd17ae04bf2aee54a4462438 100644 (file)
--- a/winrc/rsrc_unbound.rc
+++ b/winrc/rsrc_unbound.rc
@@ -1,8 +1,8 @@
 /*
   Unbound resource file for windows.  For use with windres
 */
-#include "winver.h"
 #include "config.h"
+#include "winver.h"
 
 1 ICON "winrc/combined.ico"
 /*

diff --git a/winrc/rsrc_unbound_anchor.rc b/winrc/rsrc_unbound_anchor.rc
index 76b96b785632a30e355731fc41d75d16886b1d8b..2550dd051a21a794540db2d2573e550b03265213 100644 (file)
--- a/winrc/rsrc_unbound_anchor.rc
+++ b/winrc/rsrc_unbound_anchor.rc
@@ -1,8 +1,8 @@
 /*
   Unbound resource file for windows.  For use with windres
 */
-#include "winver.h"
 #include "config.h"
+#include "winver.h"
 
 1 ICON "winrc/combined.ico"
 

diff --git a/winrc/rsrc_unbound_checkconf.rc b/winrc/rsrc_unbound_checkconf.rc
index de61900bffb173a73e9fabf435afda2f64a5c627..d974d9602e64dd5b003ed05b533704e8c990b470 100644 (file)
--- a/winrc/rsrc_unbound_checkconf.rc
+++ b/winrc/rsrc_unbound_checkconf.rc
@@ -1,8 +1,8 @@
 /*
   Unbound resource file for windows.  For use with windres
 */
-#include "winver.h"
 #include "config.h"
+#include "winver.h"
 
 1 ICON "winrc/combined.ico"
 

diff --git a/winrc/rsrc_unbound_control.rc b/winrc/rsrc_unbound_control.rc
index f9e1245dbfa917a48cc494a1af25bb711b477f46..5360c06beb3ad0eb28d3bc42b23dd1252c9b02bf 100644 (file)
--- a/winrc/rsrc_unbound_control.rc
+++ b/winrc/rsrc_unbound_control.rc
@@ -1,8 +1,8 @@
 /*
   Unbound resource file for windows.  For use with windres
 */
-#include "winver.h"
 #include "config.h"
+#include "winver.h"
 
 1 ICON "winrc/combined.ico"
 

diff --git a/winrc/rsrc_unbound_host.rc b/winrc/rsrc_unbound_host.rc
index d00f95cf4d84e8d8492e9029bb03174f612fabc3..ace6010496118621975b7ecfac0e5ca210573270 100644 (file)
--- a/winrc/rsrc_unbound_host.rc
+++ b/winrc/rsrc_unbound_host.rc
@@ -1,8 +1,8 @@
 /*
   Unbound resource file for windows.  For use with windres
 */
-#include "winver.h"
 #include "config.h"
+#include "winver.h"
 
 1 ICON "winrc/combined.ico"