From 80dd02426d1ac57f1fbc511aba2e19c5bad0f3b1 Mon Sep 17 00:00:00 2001 From: PROP 65 <132837123+PROP65@users.noreply.github.com> Date: Sat, 8 Feb 2025 06:21:31 +0000 Subject: [PATCH 01/13] Update nuklear.h --- src/nuklear.h | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/src/nuklear.h b/src/nuklear.h index 9b526566b..431c1962e 100644 --- a/src/nuklear.h +++ b/src/nuklear.h @@ -115,8 +115,9 @@ extern "C" { * * =============================================================== */ - #ifdef NK_INCLUDE_FIXED_TYPES +#ifdef NK_INCLUDE_FIXED_TYPES #include + #include #define NK_INT8 int8_t #define NK_UINT8 uint8_t #define NK_INT16 int16_t @@ -125,19 +126,39 @@ extern "C" { #define NK_UINT32 uint32_t #define NK_SIZE_TYPE uintptr_t #define NK_POINTER_TYPE uintptr_t + #define NK_INT8_FMT PRIi8 + #define NK_UINT8_FMT PRIu8 + #define NK_INT16_FMT PRIi16 + #define NK_UINT16_FMT PRIu16 + #define NK_INT32_FMT PRIi32 + #define NK_UINT32_FMT PRIu32 + #define NK_SIZE_TYPE_FMT PRIuPTR + #define NK_POINTER_TYPE_FMT PRIuPTR #else #ifndef NK_INT8 #define NK_INT8 signed char #endif + #ifndef NK_INT8_FMT + #define NK_INT8_FMT "hhi" + #endif #ifndef NK_UINT8 #define NK_UINT8 unsigned char #endif + #ifndef NK_UINT8_FMT + #define NK_UINT8_FMT "hhu" + #endif #ifndef NK_INT16 #define NK_INT16 signed short #endif + #ifndef NK_INT16_FMT + #define NK_INT16_FMT "hi" + #endif #ifndef NK_UINT16 #define NK_UINT16 unsigned short #endif + #ifndef NK_UINT16_FMT + #define NK_UINT16_FMT "hu" + #endif #ifndef NK_INT32 #if defined(_MSC_VER) #define NK_INT32 __int32 @@ -145,6 +166,13 @@ extern "C" { #define NK_INT32 signed int #endif #endif + #ifndef NK_INT32_FMT + #if defined(_MSC_VER) /* long is 32bit on Windows */ + #define NK_INT32_FMT "li" + #else + #define NK_INT32_FMT "i" + #endif + #endif #ifndef NK_UINT32 #if defined(_MSC_VER) #define NK_UINT32 unsigned __int32 @@ -152,6 +180,13 @@ extern "C" { #define NK_UINT32 unsigned int #endif #endif + #ifndef NK_UINT32_FMT + #if defined(_MSC_VER) /* long is 32bit on Windows */ + #define NK_UINT32_FMT "lu" + #else + #define NK_UINT32_FMT "u" + #endif + #endif #ifndef NK_SIZE_TYPE #if defined(_WIN64) && defined(_MSC_VER) #define NK_SIZE_TYPE unsigned __int64 @@ -167,6 +202,21 @@ extern "C" { #define NK_SIZE_TYPE unsigned long #endif #endif + #ifndef NK_SIZE_TYPE_FMT + #if defined(_WIN64) && defined(_MSC_VER) + #define NK_SIZE_TYPE_FMT "I64u" + #elif (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER) + #define NK_SIZE_TYPE_FMT "I32u" + #elif defined(__GNUC__) || defined(__clang__) + #if defined(__x86_64__) || defined(__ppc64__) || defined(__PPC64__) || defined(__aarch64__) + #define NK_SIZE_TYPE_FMT "lu" + #else + #define NK_SIZE_TYPE_FMT "u" + #endif + #else + #define NK_SIZE_TYPE_FMT "lu" + #endif + #endif #ifndef NK_POINTER_TYPE #if defined(_WIN64) && defined(_MSC_VER) #define NK_POINTER_TYPE unsigned __int64 @@ -182,6 +232,21 @@ extern "C" { #define NK_POINTER_TYPE unsigned long #endif #endif + #ifndef NK_POINTER_TYPE_FMT + #if defined(_WIN64) && defined(_MSC_VER) + #define NK_POINTER_TYPE_FMT "I64u" + #elif (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER) + #define NK_POINTER_TYPE_FMT "I32u" + #elif defined(__GNUC__) || defined(__clang__) + #if defined(__x86_64__) || defined(__ppc64__) || defined(__PPC64__) || defined(__aarch64__) + #define NK_POINTER_TYPE_FMT "lu" + #else + #define NK_POINTER_TYPE_FMT "u" + #endif + #else + #define NK_POINTER_TYPE_FMT "lu" + #endif + #endif #endif #ifndef NK_BOOL From 479c89b398ca80438942b8dafe4016cf71783793 Mon Sep 17 00:00:00 2001 From: PROP 65 <132837123+PROP65@users.noreply.github.com> Date: Sat, 8 Feb 2025 06:21:55 +0000 Subject: [PATCH 02/13] rebuild nuklear.h --- nuklear.h | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/nuklear.h b/nuklear.h index 8581bbc0a..e6373568f 100644 --- a/nuklear.h +++ b/nuklear.h @@ -337,8 +337,9 @@ extern "C" { * * =============================================================== */ - #ifdef NK_INCLUDE_FIXED_TYPES +#ifdef NK_INCLUDE_FIXED_TYPES #include + #include #define NK_INT8 int8_t #define NK_UINT8 uint8_t #define NK_INT16 int16_t @@ -347,19 +348,39 @@ extern "C" { #define NK_UINT32 uint32_t #define NK_SIZE_TYPE uintptr_t #define NK_POINTER_TYPE uintptr_t + #define NK_INT8_FMT PRIi8 + #define NK_UINT8_FMT PRIu8 + #define NK_INT16_FMT PRIi16 + #define NK_UINT16_FMT PRIu16 + #define NK_INT32_FMT PRIi32 + #define NK_UINT32_FMT PRIu32 + #define NK_SIZE_TYPE_FMT PRIuPTR + #define NK_POINTER_TYPE_FMT PRIuPTR #else #ifndef NK_INT8 #define NK_INT8 signed char #endif + #ifndef NK_INT8_FMT + #define NK_INT8_FMT "hhi" + #endif #ifndef NK_UINT8 #define NK_UINT8 unsigned char #endif + #ifndef NK_UINT8_FMT + #define NK_UINT8_FMT "hhu" + #endif #ifndef NK_INT16 #define NK_INT16 signed short #endif + #ifndef NK_INT16_FMT + #define NK_INT16_FMT "hi" + #endif #ifndef NK_UINT16 #define NK_UINT16 unsigned short #endif + #ifndef NK_UINT16_FMT + #define NK_UINT16_FMT "hu" + #endif #ifndef NK_INT32 #if defined(_MSC_VER) #define NK_INT32 __int32 @@ -367,6 +388,13 @@ extern "C" { #define NK_INT32 signed int #endif #endif + #ifndef NK_INT32_FMT + #if defined(_MSC_VER) /* long is 32bit on Windows */ + #define NK_INT32_FMT "li" + #else + #define NK_INT32_FMT "i" + #endif + #endif #ifndef NK_UINT32 #if defined(_MSC_VER) #define NK_UINT32 unsigned __int32 @@ -374,6 +402,13 @@ extern "C" { #define NK_UINT32 unsigned int #endif #endif + #ifndef NK_UINT32_FMT + #if defined(_MSC_VER) /* long is 32bit on Windows */ + #define NK_UINT32_FMT "lu" + #else + #define NK_UINT32_FMT "u" + #endif + #endif #ifndef NK_SIZE_TYPE #if defined(_WIN64) && defined(_MSC_VER) #define NK_SIZE_TYPE unsigned __int64 @@ -389,6 +424,21 @@ extern "C" { #define NK_SIZE_TYPE unsigned long #endif #endif + #ifndef NK_SIZE_TYPE_FMT + #if defined(_WIN64) && defined(_MSC_VER) + #define NK_SIZE_TYPE_FMT "I64u" + #elif (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER) + #define NK_SIZE_TYPE_FMT "I32u" + #elif defined(__GNUC__) || defined(__clang__) + #if defined(__x86_64__) || defined(__ppc64__) || defined(__PPC64__) || defined(__aarch64__) + #define NK_SIZE_TYPE_FMT "lu" + #else + #define NK_SIZE_TYPE_FMT "u" + #endif + #else + #define NK_SIZE_TYPE_FMT "lu" + #endif + #endif #ifndef NK_POINTER_TYPE #if defined(_WIN64) && defined(_MSC_VER) #define NK_POINTER_TYPE unsigned __int64 @@ -404,6 +454,21 @@ extern "C" { #define NK_POINTER_TYPE unsigned long #endif #endif + #ifndef NK_POINTER_TYPE_FMT + #if defined(_WIN64) && defined(_MSC_VER) + #define NK_POINTER_TYPE_FMT "I64u" + #elif (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER) + #define NK_POINTER_TYPE_FMT "I32u" + #elif defined(__GNUC__) || defined(__clang__) + #if defined(__x86_64__) || defined(__ppc64__) || defined(__PPC64__) || defined(__aarch64__) + #define NK_POINTER_TYPE_FMT "lu" + #else + #define NK_POINTER_TYPE_FMT "u" + #endif + #else + #define NK_POINTER_TYPE_FMT "lu" + #endif + #endif #endif #ifndef NK_BOOL From 79548f46e905c4c07312946d394c1b598e2fd644 Mon Sep 17 00:00:00 2001 From: PROP 65 <132837123+PROP65@users.noreply.github.com> Date: Sat, 8 Feb 2025 06:23:50 +0000 Subject: [PATCH 03/13] fix MSVC warning --- demo/common/overview.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/common/overview.c b/demo/common/overview.c index 45458543b..d7c15f8f8 100644 --- a/demo/common/overview.c +++ b/demo/common/overview.c @@ -444,7 +444,7 @@ overview(struct nk_context *ctx) } /* progressbar combobox */ sum = prog_a + prog_b + prog_c + prog_d; - sprintf(buffer, "%lu", sum); + sprintf(buffer, "%" NK_SIZE_TYPE_FMT, sum); if (nk_combo_begin_label(ctx, buffer, nk_vec2(200,200))) { nk_layout_row_dynamic(ctx, 30, 1); nk_progress(ctx, &prog_a, 100, NK_MODIFIABLE); @@ -456,7 +456,7 @@ overview(struct nk_context *ctx) /* checkbox combobox */ sum = (size_t)(check_values[0] + check_values[1] + check_values[2] + check_values[3] + check_values[4]); - sprintf(buffer, "%lu", sum); + sprintf(buffer, "%" NK_SIZE_TYPE_FMT, sum); if (nk_combo_begin_label(ctx, buffer, nk_vec2(200,200))) { nk_layout_row_dynamic(ctx, 30, 1); nk_checkbox_label(ctx, weapons[0], &check_values[0]); From 943b65234ac5b02e0747f8b933ee47cae825a1ee Mon Sep 17 00:00:00 2001 From: PROP 65 <132837123+PROP65@users.noreply.github.com> Date: Sat, 8 Feb 2025 06:47:55 +0000 Subject: [PATCH 04/13] Make macros more clear --- src/nuklear.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/nuklear.h b/src/nuklear.h index 431c1962e..301fc10df 100644 --- a/src/nuklear.h +++ b/src/nuklear.h @@ -258,6 +258,16 @@ extern "C" { #endif #endif +#define NK_FMT_CHAR NK_INT8_FMT +#define NK_FMT_UCHAR NK_UINT8_FMT +#define NK_FMT_BYTE NK_UINT8_FMT +#define NK_FMT_SHORT NK_INT16_FMT +#define NK_FMT_USHORT NK_UINT16_FMT +#define NK_FMT_INT NK_INT32_FMT +#define NK_FMT_UINT NK_UINT32_FMT +#define NK_FMT_SIZE NK_SIZE_TYPE_FMT +#define NK_FMT_PTR NK_POINTER_TYPE_FMT + typedef NK_INT8 nk_char; typedef NK_UINT8 nk_uchar; typedef NK_UINT8 nk_byte; From 290d0c86d80434fca943704d7320fca31a9e0a5a Mon Sep 17 00:00:00 2001 From: PROP 65 <132837123+PROP65@users.noreply.github.com> Date: Sat, 8 Feb 2025 06:48:38 +0000 Subject: [PATCH 05/13] Rebuild nuklear.h --- nuklear.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nuklear.h b/nuklear.h index e6373568f..16fab721f 100644 --- a/nuklear.h +++ b/nuklear.h @@ -480,6 +480,16 @@ extern "C" { #endif #endif +#define NK_FMT_CHAR NK_INT8_FMT +#define NK_FMT_UCHAR NK_UINT8_FMT +#define NK_FMT_BYTE NK_UINT8_FMT +#define NK_FMT_SHORT NK_INT16_FMT +#define NK_FMT_USHORT NK_UINT16_FMT +#define NK_FMT_INT NK_INT32_FMT +#define NK_FMT_UINT NK_UINT32_FMT +#define NK_FMT_SIZE NK_SIZE_TYPE_FMT +#define NK_FMT_PTR NK_POINTER_TYPE_FMT + typedef NK_INT8 nk_char; typedef NK_UINT8 nk_uchar; typedef NK_UINT8 nk_byte; From f862c811d1ae8dd5af6fb9b33f26e6fc10f1180a Mon Sep 17 00:00:00 2001 From: PROP 65 <132837123+PROP65@users.noreply.github.com> Date: Sat, 8 Feb 2025 06:49:40 +0000 Subject: [PATCH 06/13] Update macros --- demo/common/overview.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/common/overview.c b/demo/common/overview.c index d7c15f8f8..fc28269d1 100644 --- a/demo/common/overview.c +++ b/demo/common/overview.c @@ -444,7 +444,7 @@ overview(struct nk_context *ctx) } /* progressbar combobox */ sum = prog_a + prog_b + prog_c + prog_d; - sprintf(buffer, "%" NK_SIZE_TYPE_FMT, sum); + sprintf(buffer, "%" NK_FMT_SIZE, sum); if (nk_combo_begin_label(ctx, buffer, nk_vec2(200,200))) { nk_layout_row_dynamic(ctx, 30, 1); nk_progress(ctx, &prog_a, 100, NK_MODIFIABLE); @@ -456,7 +456,7 @@ overview(struct nk_context *ctx) /* checkbox combobox */ sum = (size_t)(check_values[0] + check_values[1] + check_values[2] + check_values[3] + check_values[4]); - sprintf(buffer, "%" NK_SIZE_TYPE_FMT, sum); + sprintf(buffer, "%" NK_FMT_SIZE, sum); if (nk_combo_begin_label(ctx, buffer, nk_vec2(200,200))) { nk_layout_row_dynamic(ctx, 30, 1); nk_checkbox_label(ctx, weapons[0], &check_values[0]); From 09438a4945b65124dcc0ed4b9f27b1972f2438c2 Mon Sep 17 00:00:00 2001 From: PROP 65 <132837123+PROP65@users.noreply.github.com> Date: Sat, 8 Feb 2025 07:28:35 +0000 Subject: [PATCH 07/13] remove hh (not allowed in C89, whoops), change pointers to hex --- src/nuklear.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/nuklear.h b/src/nuklear.h index 301fc10df..74ff4aa82 100644 --- a/src/nuklear.h +++ b/src/nuklear.h @@ -133,19 +133,19 @@ extern "C" { #define NK_INT32_FMT PRIi32 #define NK_UINT32_FMT PRIu32 #define NK_SIZE_TYPE_FMT PRIuPTR - #define NK_POINTER_TYPE_FMT PRIuPTR + #define NK_POINTER_TYPE_FMT PRIxPTR #else #ifndef NK_INT8 #define NK_INT8 signed char #endif #ifndef NK_INT8_FMT - #define NK_INT8_FMT "hhi" + #define NK_INT8_FMT "hi" #endif #ifndef NK_UINT8 #define NK_UINT8 unsigned char #endif #ifndef NK_UINT8_FMT - #define NK_UINT8_FMT "hhu" + #define NK_UINT8_FMT "hu" #endif #ifndef NK_INT16 #define NK_INT16 signed short @@ -234,17 +234,17 @@ extern "C" { #endif #ifndef NK_POINTER_TYPE_FMT #if defined(_WIN64) && defined(_MSC_VER) - #define NK_POINTER_TYPE_FMT "I64u" + #define NK_POINTER_TYPE_FMT "I64x" #elif (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER) - #define NK_POINTER_TYPE_FMT "I32u" + #define NK_POINTER_TYPE_FMT "I32x" #elif defined(__GNUC__) || defined(__clang__) #if defined(__x86_64__) || defined(__ppc64__) || defined(__PPC64__) || defined(__aarch64__) - #define NK_POINTER_TYPE_FMT "lu" + #define NK_POINTER_TYPE_FMT "lx" #else - #define NK_POINTER_TYPE_FMT "u" + #define NK_POINTER_TYPE_FMT "x" #endif #else - #define NK_POINTER_TYPE_FMT "lu" + #define NK_POINTER_TYPE_FMT "lx" #endif #endif #endif From 9510cbae586a6bcbf8a1cb08f1dc7a635f148739 Mon Sep 17 00:00:00 2001 From: PROP 65 <132837123+PROP65@users.noreply.github.com> Date: Sat, 8 Feb 2025 07:29:44 +0000 Subject: [PATCH 08/13] Rebuild nuklear.h again --- nuklear.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nuklear.h b/nuklear.h index 16fab721f..25b43bce6 100644 --- a/nuklear.h +++ b/nuklear.h @@ -355,19 +355,19 @@ extern "C" { #define NK_INT32_FMT PRIi32 #define NK_UINT32_FMT PRIu32 #define NK_SIZE_TYPE_FMT PRIuPTR - #define NK_POINTER_TYPE_FMT PRIuPTR + #define NK_POINTER_TYPE_FMT PRIxPTR #else #ifndef NK_INT8 #define NK_INT8 signed char #endif #ifndef NK_INT8_FMT - #define NK_INT8_FMT "hhi" + #define NK_INT8_FMT "hi" #endif #ifndef NK_UINT8 #define NK_UINT8 unsigned char #endif #ifndef NK_UINT8_FMT - #define NK_UINT8_FMT "hhu" + #define NK_UINT8_FMT "hu" #endif #ifndef NK_INT16 #define NK_INT16 signed short @@ -456,17 +456,17 @@ extern "C" { #endif #ifndef NK_POINTER_TYPE_FMT #if defined(_WIN64) && defined(_MSC_VER) - #define NK_POINTER_TYPE_FMT "I64u" + #define NK_POINTER_TYPE_FMT "I64x" #elif (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER) - #define NK_POINTER_TYPE_FMT "I32u" + #define NK_POINTER_TYPE_FMT "I32x" #elif defined(__GNUC__) || defined(__clang__) #if defined(__x86_64__) || defined(__ppc64__) || defined(__PPC64__) || defined(__aarch64__) - #define NK_POINTER_TYPE_FMT "lu" + #define NK_POINTER_TYPE_FMT "lx" #else - #define NK_POINTER_TYPE_FMT "u" + #define NK_POINTER_TYPE_FMT "x" #endif #else - #define NK_POINTER_TYPE_FMT "lu" + #define NK_POINTER_TYPE_FMT "lx" #endif #endif #endif From 8c729d70098930786a5a68dad83133ca82ef7e40 Mon Sep 17 00:00:00 2001 From: PROP 65 <132837123+PROP65@users.noreply.github.com> Date: Sat, 8 Feb 2025 20:31:47 +0000 Subject: [PATCH 09/13] Change 32bit formatting on MSVC --- src/nuklear.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/nuklear.h b/src/nuklear.h index 74ff4aa82..384e44b51 100644 --- a/src/nuklear.h +++ b/src/nuklear.h @@ -167,8 +167,8 @@ extern "C" { #endif #endif #ifndef NK_INT32_FMT - #if defined(_MSC_VER) /* long is 32bit on Windows */ - #define NK_INT32_FMT "li" + #if defined(_MSC_VER) + #define NK_INT32_FMT "I32d" #else #define NK_INT32_FMT "i" #endif @@ -181,8 +181,8 @@ extern "C" { #endif #endif #ifndef NK_UINT32_FMT - #if defined(_MSC_VER) /* long is 32bit on Windows */ - #define NK_UINT32_FMT "lu" + #if defined(_MSC_VER) + #define NK_UINT32_FMT "I32u" #else #define NK_UINT32_FMT "u" #endif From 34d7f1a7c26b37aba9f815393796514416d24a14 Mon Sep 17 00:00:00 2001 From: PROP 65 <132837123+PROP65@users.noreply.github.com> Date: Sat, 8 Feb 2025 20:32:26 +0000 Subject: [PATCH 10/13] Rebuild nuklear.h --- nuklear.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nuklear.h b/nuklear.h index 25b43bce6..18ff83684 100644 --- a/nuklear.h +++ b/nuklear.h @@ -389,8 +389,8 @@ extern "C" { #endif #endif #ifndef NK_INT32_FMT - #if defined(_MSC_VER) /* long is 32bit on Windows */ - #define NK_INT32_FMT "li" + #if defined(_MSC_VER) + #define NK_INT32_FMT "I32d" #else #define NK_INT32_FMT "i" #endif @@ -403,8 +403,8 @@ extern "C" { #endif #endif #ifndef NK_UINT32_FMT - #if defined(_MSC_VER) /* long is 32bit on Windows */ - #define NK_UINT32_FMT "lu" + #if defined(_MSC_VER) + #define NK_UINT32_FMT "I32u" #else #define NK_UINT32_FMT "u" #endif From 859c86cd6bf61e24d73d117a76ac4175eb1cb964 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Tue, 11 Feb 2025 10:55:11 -0500 Subject: [PATCH 11/13] Update changelog for 4.12.5 --- nuklear.h | 1 + src/CHANGELOG | 1 + 2 files changed, 2 insertions(+) diff --git a/nuklear.h b/nuklear.h index 18ff83684..af905290d 100644 --- a/nuklear.h +++ b/nuklear.h @@ -30773,6 +30773,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args) /// - [y]: Minor version with non-breaking API and library changes /// - [z]: Patch version with no direct changes to the API /// +/// - 2025/02/11 (4.12.5) - Add printf formatting macros for nk data types /// - 2024/12/11 (4.12.4) - Fix array subscript [0, 0] is outside array bounds of ‘char[1]’ /// - 2024/12/11 (4.12.3) - Fix border color for property widgets /// - 2024/11/20 (4.12.2) - Fix int/float type conversion warnings in `nk_roundf` diff --git a/src/CHANGELOG b/src/CHANGELOG index 89405d0c5..06a2f628a 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -7,6 +7,7 @@ /// - [y]: Minor version with non-breaking API and library changes /// - [z]: Patch version with no direct changes to the API /// +/// - 2025/02/11 (4.12.5) - Add printf formatting macros for nk data types /// - 2024/12/11 (4.12.4) - Fix array subscript [0, 0] is outside array bounds of ‘char[1]’ /// - 2024/12/11 (4.12.3) - Fix border color for property widgets /// - 2024/11/20 (4.12.2) - Fix int/float type conversion warnings in `nk_roundf` From 447fa19f67e058c64ac6f64a2cdcdfb8fdbdf9c3 Mon Sep 17 00:00:00 2001 From: PROP 65 <132837123+PROP65@users.noreply.github.com> Date: Thu, 13 Feb 2025 01:08:26 +0000 Subject: [PATCH 12/13] MinGW patch --- src/nuklear.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/nuklear.h b/src/nuklear.h index 384e44b51..aa3385ee2 100644 --- a/src/nuklear.h +++ b/src/nuklear.h @@ -139,58 +139,58 @@ extern "C" { #define NK_INT8 signed char #endif #ifndef NK_INT8_FMT - #define NK_INT8_FMT "hi" + #define NK_INT8_FMT "i" #endif #ifndef NK_UINT8 #define NK_UINT8 unsigned char #endif #ifndef NK_UINT8_FMT - #define NK_UINT8_FMT "hu" + #define NK_UINT8_FMT "u" #endif #ifndef NK_INT16 #define NK_INT16 signed short #endif #ifndef NK_INT16_FMT - #define NK_INT16_FMT "hi" + #define NK_INT16_FMT "i" #endif #ifndef NK_UINT16 #define NK_UINT16 unsigned short #endif #ifndef NK_UINT16_FMT - #define NK_UINT16_FMT "hu" + #define NK_UINT16_FMT "u" #endif #ifndef NK_INT32 - #if defined(_MSC_VER) + #if defined(_MSC_VER) || defined(__MINGW32__) || defined(__MINGW64__) #define NK_INT32 __int32 #else #define NK_INT32 signed int #endif #endif #ifndef NK_INT32_FMT - #if defined(_MSC_VER) + #if defined(_MSC_VER) || defined(__MINGW32__) || defined(__MINGW64__) #define NK_INT32_FMT "I32d" #else #define NK_INT32_FMT "i" #endif #endif #ifndef NK_UINT32 - #if defined(_MSC_VER) + #if defined(_MSC_VER) || defined(__MINGW32__) || defined(__MINGW64__) #define NK_UINT32 unsigned __int32 #else #define NK_UINT32 unsigned int #endif #endif #ifndef NK_UINT32_FMT - #if defined(_MSC_VER) + #if defined(_MSC_VER) || defined(__MINGW32__) || defined(__MINGW64__) #define NK_UINT32_FMT "I32u" #else #define NK_UINT32_FMT "u" #endif #endif #ifndef NK_SIZE_TYPE - #if defined(_WIN64) && defined(_MSC_VER) + #if (defined(_WIN64) && defined(_MSC_VER)) || defined(__MINGW64__) #define NK_SIZE_TYPE unsigned __int64 - #elif (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER) + #elif ((defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER)) || defined(__MINGW32__) #define NK_SIZE_TYPE unsigned __int32 #elif defined(__GNUC__) || defined(__clang__) #if defined(__x86_64__) || defined(__ppc64__) || defined(__PPC64__) || defined(__aarch64__) @@ -203,9 +203,9 @@ extern "C" { #endif #endif #ifndef NK_SIZE_TYPE_FMT - #if defined(_WIN64) && defined(_MSC_VER) + #if (defined(_WIN64) && defined(_MSC_VER)) || defined(__MINGW64__) #define NK_SIZE_TYPE_FMT "I64u" - #elif (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER) + #elif ((defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER)) || defined(__MINGW32__) #define NK_SIZE_TYPE_FMT "I32u" #elif defined(__GNUC__) || defined(__clang__) #if defined(__x86_64__) || defined(__ppc64__) || defined(__PPC64__) || defined(__aarch64__) @@ -218,9 +218,9 @@ extern "C" { #endif #endif #ifndef NK_POINTER_TYPE - #if defined(_WIN64) && defined(_MSC_VER) + #if (defined(_WIN64) && defined(_MSC_VER)) || defined(__MINGW64__) #define NK_POINTER_TYPE unsigned __int64 - #elif (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER) + #elif ((defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER)) || defined(__MINGW32__) #define NK_POINTER_TYPE unsigned __int32 #elif defined(__GNUC__) || defined(__clang__) #if defined(__x86_64__) || defined(__ppc64__) || defined(__PPC64__) || defined(__aarch64__) @@ -233,9 +233,9 @@ extern "C" { #endif #endif #ifndef NK_POINTER_TYPE_FMT - #if defined(_WIN64) && defined(_MSC_VER) + #if (defined(_WIN64) && defined(_MSC_VER)) || defined(__MINGW64__) #define NK_POINTER_TYPE_FMT "I64x" - #elif (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER) + #elif ((defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER)) || defined(__MINGW32__) #define NK_POINTER_TYPE_FMT "I32x" #elif defined(__GNUC__) || defined(__clang__) #if defined(__x86_64__) || defined(__ppc64__) || defined(__PPC64__) || defined(__aarch64__) From 2ea9cb71f9bc692d63eec8ab73fb3c99b7c6e0d7 Mon Sep 17 00:00:00 2001 From: PROP 65 <132837123+PROP65@users.noreply.github.com> Date: Thu, 13 Feb 2025 01:08:41 +0000 Subject: [PATCH 13/13] Rebuild nuklear.h --- nuklear.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/nuklear.h b/nuklear.h index af905290d..9f03861b3 100644 --- a/nuklear.h +++ b/nuklear.h @@ -361,58 +361,58 @@ extern "C" { #define NK_INT8 signed char #endif #ifndef NK_INT8_FMT - #define NK_INT8_FMT "hi" + #define NK_INT8_FMT "i" #endif #ifndef NK_UINT8 #define NK_UINT8 unsigned char #endif #ifndef NK_UINT8_FMT - #define NK_UINT8_FMT "hu" + #define NK_UINT8_FMT "u" #endif #ifndef NK_INT16 #define NK_INT16 signed short #endif #ifndef NK_INT16_FMT - #define NK_INT16_FMT "hi" + #define NK_INT16_FMT "i" #endif #ifndef NK_UINT16 #define NK_UINT16 unsigned short #endif #ifndef NK_UINT16_FMT - #define NK_UINT16_FMT "hu" + #define NK_UINT16_FMT "u" #endif #ifndef NK_INT32 - #if defined(_MSC_VER) + #if defined(_MSC_VER) || defined(__MINGW32__) || defined(__MINGW64__) #define NK_INT32 __int32 #else #define NK_INT32 signed int #endif #endif #ifndef NK_INT32_FMT - #if defined(_MSC_VER) + #if defined(_MSC_VER) || defined(__MINGW32__) || defined(__MINGW64__) #define NK_INT32_FMT "I32d" #else #define NK_INT32_FMT "i" #endif #endif #ifndef NK_UINT32 - #if defined(_MSC_VER) + #if defined(_MSC_VER) || defined(__MINGW32__) || defined(__MINGW64__) #define NK_UINT32 unsigned __int32 #else #define NK_UINT32 unsigned int #endif #endif #ifndef NK_UINT32_FMT - #if defined(_MSC_VER) + #if defined(_MSC_VER) || defined(__MINGW32__) || defined(__MINGW64__) #define NK_UINT32_FMT "I32u" #else #define NK_UINT32_FMT "u" #endif #endif #ifndef NK_SIZE_TYPE - #if defined(_WIN64) && defined(_MSC_VER) + #if (defined(_WIN64) && defined(_MSC_VER)) || defined(__MINGW64__) #define NK_SIZE_TYPE unsigned __int64 - #elif (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER) + #elif ((defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER)) || defined(__MINGW32__) #define NK_SIZE_TYPE unsigned __int32 #elif defined(__GNUC__) || defined(__clang__) #if defined(__x86_64__) || defined(__ppc64__) || defined(__PPC64__) || defined(__aarch64__) @@ -425,9 +425,9 @@ extern "C" { #endif #endif #ifndef NK_SIZE_TYPE_FMT - #if defined(_WIN64) && defined(_MSC_VER) + #if (defined(_WIN64) && defined(_MSC_VER)) || defined(__MINGW64__) #define NK_SIZE_TYPE_FMT "I64u" - #elif (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER) + #elif ((defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER)) || defined(__MINGW32__) #define NK_SIZE_TYPE_FMT "I32u" #elif defined(__GNUC__) || defined(__clang__) #if defined(__x86_64__) || defined(__ppc64__) || defined(__PPC64__) || defined(__aarch64__) @@ -440,9 +440,9 @@ extern "C" { #endif #endif #ifndef NK_POINTER_TYPE - #if defined(_WIN64) && defined(_MSC_VER) + #if (defined(_WIN64) && defined(_MSC_VER)) || defined(__MINGW64__) #define NK_POINTER_TYPE unsigned __int64 - #elif (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER) + #elif ((defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER)) || defined(__MINGW32__) #define NK_POINTER_TYPE unsigned __int32 #elif defined(__GNUC__) || defined(__clang__) #if defined(__x86_64__) || defined(__ppc64__) || defined(__PPC64__) || defined(__aarch64__) @@ -455,9 +455,9 @@ extern "C" { #endif #endif #ifndef NK_POINTER_TYPE_FMT - #if defined(_WIN64) && defined(_MSC_VER) + #if (defined(_WIN64) && defined(_MSC_VER)) || defined(__MINGW64__) #define NK_POINTER_TYPE_FMT "I64x" - #elif (defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER) + #elif ((defined(_WIN32) || defined(WIN32)) && defined(_MSC_VER)) || defined(__MINGW32__) #define NK_POINTER_TYPE_FMT "I32x" #elif defined(__GNUC__) || defined(__clang__) #if defined(__x86_64__) || defined(__ppc64__) || defined(__PPC64__) || defined(__aarch64__)