From a135d9c25d668640c43bbaffa54903b2c55f80f4 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sun, 8 Aug 2021 13:23:04 +0200 Subject: [PATCH] REVIEWED: Avoid conflict with bool --- src/external/par_shapes.h | 3 +++ src/models.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/external/par_shapes.h b/src/external/par_shapes.h index f44987a30..994a605a9 100644 --- a/src/external/par_shapes.h +++ b/src/external/par_shapes.h @@ -31,6 +31,8 @@ extern "C" { #endif #include +// Ray (@raysan5): Commented to avoid conflict with raylib bool +/* #if !defined(_MSC_VER) # include #else // MSVC @@ -42,6 +44,7 @@ extern "C" { # define false 0 # endif #endif +*/ #ifndef PAR_SHAPES_T #define PAR_SHAPES_T uint16_t diff --git a/src/models.c b/src/models.c index 68785347e..329d8d4a8 100644 --- a/src/models.c +++ b/src/models.c @@ -79,7 +79,6 @@ #define PAR_SHAPES_IMPLEMENTATION #include "external/par_shapes.h" // Shapes 3d parametric generation - #undef bool #endif #if defined(_WIN32)