diff options
| author | Yuyang Huang <yuyanghuang@google.com> | 2024-02-26 15:15:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-26 15:15:56 +0000 |
| commit | 685f93590096cc00444cba94d79c29d6ce6a4105 (patch) | |
| tree | 494ac233b391e8515c0503ff39ab3d291d74c69d | |
| parent | 85786ffacd06015af5b5614776166c854d103f71 (diff) | |
| parent | 2f4648665c8867201b964617b15c3442fa0ae803 (diff) | |
| download | apf-685f93590096cc00444cba94d79c29d6ce6a4105.tar.gz | |
v5: fix potential bool typedef conflict. am: 2f4648665c
Original change: https://android-review.googlesource.com/c/platform/hardware/google/apf/+/2976611
Change-Id: I7e01a4aa10b7ee4189a01b3a09a9cb565768ea69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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" |