From d1a2bd67da3317d1b7c38f63621a188d6f735e06 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 17 Jan 2024 16:19:56 +0100
Subject: [PATCH] - Fix warning for windres on resource files due to
 redefinition.

---
 doc/Changelog                   | 1 +
 winrc/rsrc_anchorupd.rc         | 2 +-
 winrc/rsrc_svcinst.rc           | 2 +-
 winrc/rsrc_svcuninst.rc         | 2 +-
 winrc/rsrc_unbound.rc           | 2 +-
 winrc/rsrc_unbound_anchor.rc    | 2 +-
 winrc/rsrc_unbound_checkconf.rc | 2 +-
 winrc/rsrc_unbound_control.rc   | 2 +-
 winrc/rsrc_unbound_host.rc      | 2 +-
 9 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 2fb11dadc..e57943241 100644
--- 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 2419bfad5..ac5167866 100644
--- 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 cb325f4c4..0ed113695 100644
--- 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 ecff8dcd3..86bed5e89 100644
--- 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 cc05d0eeb..d6db15eeb 100644
--- 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 76b96b785..2550dd051 100644
--- 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 de61900bf..d974d9602 100644
--- 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 f9e1245db..5360c06be 100644
--- 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 d00f95cf4..ace601049 100644
--- 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"