Merge pull request #82638 from Repiteo/check_c_headers-to-dictionary

`check_c_headers` from tuple array to dictionary
godotengine · Oct 3, 2023 · 090a5b0 · 090a5b0
2 parents 3a5d524 + e9b2af9
commit 090a5b0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/SConstruct b/SConstruct
@@ -988,9 +988,10 @@ if selected_platform in platform_list:
     # Check for the existence of headers
     conf = Configure(env)
     if "check_c_headers" in env:
-        for header in env["check_c_headers"]:
-            if conf.CheckCHeader(header[0]):
-                env.AppendUnique(CPPDEFINES=[header[1]])
+        headers = env["check_c_headers"]
+        for header in headers:
+            if conf.CheckCHeader(header):
+                env.AppendUnique(CPPDEFINES=[headers[header]])
 
 elif selected_platform != "":
     if selected_platform == "list":

diff --git a/drivers/unix/SCsub b/drivers/unix/SCsub
@@ -4,4 +4,4 @@ Import("env")
 
 env.add_source_files(env.drivers_sources, "*.cpp")
 
-env["check_c_headers"] = [["mntent.h", "HAVE_MNTENT"]]
+env["check_c_headers"] = {"mntent.h": "HAVE_MNTENT"}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@ Import("env")

		env.add_source_files(env.drivers_sources, "*.cpp")

		env["check_c_headers"] = [["mntent.h", "HAVE_MNTENT"]]
		env["check_c_headers"] = {"mntent.h": "HAVE_MNTENT"}