diff options
| author | 2023-02-01 02:12:03 +0000 | |
|---|---|---|
| committer | 2023-02-01 02:12:03 +0000 | |
| commit | c28ac2bcd8bbc0e6afc9ca2e58a149fd4985324f (patch) | |
| tree | 269c5080f476ef79e970c9290918ff9a0c2e6a61 | |
| parent | 5f2e47252b1e5d0d872079fabc94ac31f4ec7abf (diff) | |
| parent | ef980f71b99659b402b5e883b9fb5d008224986d (diff) | |
Merge "Use extern "C" instead of __BEGIN_DECLS" am: 9e3c5380df am: bdbeb34369 am: ef980f71b9
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2408572
Change-Id: I6d211060b78d41468b406e689e6c82035cfe098a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/binder/trusty/include_mock/lib/tipc/tipc.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libs/binder/trusty/include_mock/lib/tipc/tipc.h b/libs/binder/trusty/include_mock/lib/tipc/tipc.h index f295be4980..ead9f9cdaf 100644 --- a/libs/binder/trusty/include_mock/lib/tipc/tipc.h +++ b/libs/binder/trusty/include_mock/lib/tipc/tipc.h @@ -15,7 +15,9 @@ */ #pragma once -__BEGIN_DECLS +#if defined(__cplusplus) +extern "C" { +#endif struct tipc_hset; @@ -26,4 +28,6 @@ int tipc_run_event_loop(struct tipc_hset*) { return 0; } -__END_DECLS +#if defined(__cplusplus) +} +#endif |