UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

REVIEWED: Avoid conflict with bool

Browse source
This commit is contained in:
raysan5 2021-08-08 13:23:04 +02:00
parent ee72497eef
commit a135d9c25d
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/external/par_shapes.h vendored
View file

@ -31,6 +31,8 @@ extern "C" {
#endif #endif
#include <stdint.h> #include <stdint.h>
// Ray (@raysan5): Commented to avoid conflict with raylib bool
/*
#if !defined(_MSC_VER) #if !defined(_MSC_VER)
# include <stdbool.h> # include <stdbool.h>
#else // MSVC #else // MSVC
@ -42,6 +44,7 @@ extern "C" {
# define false 0 # define false 0
# endif # endif
#endif #endif
*/
#ifndef PAR_SHAPES_T #ifndef PAR_SHAPES_T
#define PAR_SHAPES_T uint16_t #define PAR_SHAPES_T uint16_t

1
src/models.c
View file

@ -79,7 +79,6 @@
#define PAR_SHAPES_IMPLEMENTATION #define PAR_SHAPES_IMPLEMENTATION
#include "external/par_shapes.h" // Shapes 3d parametric generation #include "external/par_shapes.h" // Shapes 3d parametric generation
#undef bool
#endif #endif
#if defined(_WIN32) #if defined(_WIN32)