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

NLnetLabs · Jan 17, 2024 · d1a2bd6 · d1a2bd6
1 parent 7708429
commit d1a2bd6
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"