From 39d149752f5162eda8f2dbb990517c1db1c0c345 Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Wed, 27 Apr 2022 04:41:11 +0200
Subject: [PATCH] fix(build): missing definitions for sizeof macros #16393

Verified with -Wundef

Fixes #16392
---
 config/CMakeLists.txt | 12 ++++++------
 config/config.h.in    |  9 ++++++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index 8f93e1eb27..abc6dde008 100644
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -5,12 +5,12 @@ include(CheckIncludeFiles)
 include(CheckCSourceRuns)
 include(CheckCSourceCompiles)
 
-check_type_size("int" SIZEOF_INT)
-check_type_size("long" SIZEOF_LONG)
-check_type_size("intmax_t" SIZEOF_INTMAX_T)
-check_type_size("size_t" SIZEOF_SIZE_T)
-check_type_size("long long" SIZEOF_LONG_LONG)
-check_type_size("void *" SIZEOF_VOID_PTR)
+check_type_size("int" SIZEOF_INT LANGUAGE C)
+check_type_size("long" SIZEOF_LONG LANGUAGE C)
+check_type_size("intmax_t" SIZEOF_INTMAX_T LANGUAGE C)
+check_type_size("size_t" SIZEOF_SIZE_T LANGUAGE C)
+check_type_size("long long" SIZEOF_LONG_LONG LANGUAGE C)
+check_type_size("void *" SIZEOF_VOID_PTR LANGUAGE C)
 
 check_symbol_exists(_NSGetEnviron crt_externs.h HAVE__NSGETENVIRON)
 
diff --git a/config/config.h.in b/config/config.h.in
index b44b7238d2..72ac87bbb3 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -3,8 +3,11 @@
 
 #cmakedefine DEBUG
 
-#define SIZEOF_INT @SIZEOF_INT@
-#define SIZEOF_LONG @SIZEOF_LONG@
+#cmakedefine SIZEOF_INT @SIZEOF_INT@
+#cmakedefine SIZEOF_INTMAX_T @SIZEOF_INTMAX_T@
+#cmakedefine SIZEOF_LONG @SIZEOF_LONG@
+#cmakedefine SIZEOF_LONG_LONG @SIZEOF_LONG_LONG@
+#cmakedefine SIZEOF_SIZE_T @SIZEOF_SIZE_T@
 
 #if @SIZEOF_VOID_PTR@ == 8
 #define ARCH_64
@@ -12,7 +15,7 @@
 #define ARCH_32
 #endif
 
-#define PROJECT_NAME "@PROJECT_NAME@"
+#cmakedefine PROJECT_NAME "@PROJECT_NAME@"
 
 #cmakedefine HAVE__NSGETENVIRON
 #cmakedefine HAVE_FD_CLOEXEC