diff options
| author | Yuyang Huang <yuyanghuang@google.com> | 2024-02-26 19:09:56 +0900 |
|---|---|---|
| committer | Yuyang Huang <yuyanghuang@google.com> | 2024-02-26 19:17:39 +0900 |
| commit | 2f4648665c8867201b964617b15c3442fa0ae803 (patch) | |
| tree | 494ac233b391e8515c0503ff39ab3d291d74c69d | |
| parent | 82e41db69beaa95862b0edf280cfcc6a7521d706 (diff) | |
| download | apf-2f4648665c8867201b964617b15c3442fa0ae803.tar.gz | |
v5: fix potential bool typedef conflict.
This commit undefines potentially existing bool, true, and false and
redefine them before using it in apf_interperter.c. This prevents
building error due to naming conflicts.
Bug: 293694479
Test: TH
Change-Id: I3f0d52a2c51f90a4f27933d7c61daed53f789379
| -rw-r--r-- | v5/apf_interpreter.c | 8 | ||||
| -rw-r--r-- | v5/apf_interpreter_source.c | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/v5/apf_interpreter.c b/v5/apf_interpreter.c index 17e3525..b8ce799 100644 --- a/v5/apf_interpreter.c +++ b/v5/apf_interpreter.c @@ -24,7 +24,13 @@ #define FALLTHROUGH #endif -typedef enum { false, true } bool; +#undef bool +#undef true +#undef false +typedef enum { False, True } Boolean; +#define bool Boolean +#define true True +#define false False /* Begin include of apf_defs.h */ typedef int8_t s8; diff --git a/v5/apf_interpreter_source.c b/v5/apf_interpreter_source.c index f38b48a..66b0559 100644 --- a/v5/apf_interpreter_source.c +++ b/v5/apf_interpreter_source.c @@ -24,7 +24,13 @@ #define FALLTHROUGH #endif -typedef enum { false, true } bool; +#undef bool +#undef true +#undef false +typedef enum { False, True } Boolean; +#define bool Boolean +#define true True +#define false False #include "apf_defs.h" #include "apf.h" |