collabvm/r3
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't typedef bool if compiling with C++

Browse source 
If using the C++ wrapper provided by r3.hpp, you get a compiler
error when r3_define.h tries to typedef bool as C++ already has
native bool type.  Modified the guard around this typedef
to include a check for C++ compilation (!defined(__cplusplus)).
This commit is contained in:
Steve Jones 2015-09-28 11:42:45 -05:00
parent eb2ff77e5c
commit d12296af59
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/r3_define.h
View file

@ -9,7 +9,7 @@
#define DEFINE_H #define DEFINE_H
#include <stdbool.h> #include <stdbool.h>
#ifndef bool #if !defined(bool) && !defined(__cplusplus)
typedef unsigned char bool; typedef unsigned char bool;
#endif #endif
#ifndef FALSE #ifndef FALSE