diff options
| author | raysan5 <[email protected]> | 2021-08-08 13:23:04 +0200 |
|---|---|---|
| committer | raysan5 <[email protected]> | 2021-08-08 13:23:04 +0200 |
| commit | a135d9c25d668640c43bbaffa54903b2c55f80f4 (patch) | |
| tree | 000ade9c821c1f717a0c94df4829a1c0c0717dcf /src | |
| parent | ee72497eef324aaac0abede3bfe6a89b0e1d8fb7 (diff) | |
| download | raylib-a135d9c25d668640c43bbaffa54903b2c55f80f4.tar.gz raylib-a135d9c25d668640c43bbaffa54903b2c55f80f4.zip | |
REVIEWED: Avoid conflict with bool
Diffstat (limited to 'src')
| -rw-r--r-- | src/external/par_shapes.h | 3 | ||||
| -rw-r--r-- | src/models.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/external/par_shapes.h b/src/external/par_shapes.h index f44987a3..994a605a 100644 --- a/src/external/par_shapes.h +++ b/src/external/par_shapes.h @@ -31,6 +31,8 @@ extern "C" { #endif #include <stdint.h> +// Ray (@raysan5): Commented to avoid conflict with raylib bool +/* #if !defined(_MSC_VER) # include <stdbool.h> #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 68785347..329d8d4a 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) |