From d65f331efc70454312f1e23653703e67b459d7cc Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Thu, 22 Feb 2024 13:08:36 +0100
Subject: [PATCH] configure: Build with -Wwrite-strings.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

libs/vkd3d-shader/hlsl.c: In function ‘declare_predefined_types’:
libs/vkd3d-shader/hlsl.c:3408:10: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
         {"technique",    9},
          ^~~~~~~~~~~
...
programs/vkd3d-compiler/main.c: In function ‘parse_formatting’:
programs/vkd3d-compiler/main.c:303:10: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
         {"colour",  VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR},
          ^~~~~~~~
...

macOS tigetstr() takes a non-const char *, so account for that as well.
---
 configure.ac                   | 1 +
 libs/vkd3d-shader/hlsl.c       | 2 +-
 programs/vkd3d-compiler/main.c | 4 ++--
 programs/vkd3d-dxbc/main.c     | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index e2376b0d..caceb445 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,6 +70,7 @@ AS_IF([test "x${GCC}" = "xyes"],
       VKD3D_CHECK_CFLAGS([-Wtype-limits])
       VKD3D_CHECK_CFLAGS([-Wunused-but-set-parameter])
       VKD3D_CHECK_CFLAGS([-Wvla])
+      VKD3D_CHECK_CFLAGS([-Wwrite-strings])
       VKD3D_CHECK_CFLAGS([-Wl,--no-undefined])])
 
 dnl Check for cross compilers
diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index 978c414d..0e75edd4 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -3403,7 +3403,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx)
 
     static const struct
     {
-        char *name;
+        const char *name;
         unsigned int version;
     }
     technique_types[] =
diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c
index 3fa54aad..fdb1cade 100644
--- a/programs/vkd3d-compiler/main.c
+++ b/programs/vkd3d-compiler/main.c
@@ -295,7 +295,7 @@ static bool parse_formatting(uint32_t *formatting, bool *colour, char *arg)
 {
     static const struct formatting_option
     {
-        char *name;
+        const char *name;
         enum vkd3d_shader_compile_option_formatting_flags value;
     }
     opts[] =
@@ -694,7 +694,7 @@ static bool has_colour(FILE *f)
     setupterm(NULL, fileno(f), &ret);
     if (ret != 1)
         return false;
-    supported = !!tigetstr("setaf");
+    supported = !!tigetstr((char *)"setaf");
     del_curterm(cur_term);
 
     return supported;
diff --git a/programs/vkd3d-dxbc/main.c b/programs/vkd3d-dxbc/main.c
index b6786b71..e76bcb63 100644
--- a/programs/vkd3d-dxbc/main.c
+++ b/programs/vkd3d-dxbc/main.c
@@ -71,7 +71,7 @@ static bool has_colour(void)
     setupterm(NULL, fileno(stdout), &ret);
     if (ret != 1)
         return false;
-    supported = !!tigetstr("setaf");
+    supported = !!tigetstr((char *)"setaf");
     del_curterm(cur_term);
 
     return supported;