summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Willden <swillden@google.com>2015-07-08 09:40:54 -0600
committerShawn Willden <swillden@google.com>2015-07-08 09:40:54 -0600
commit3d3a47925366e72b68d9041605c7bbdab95f1d68 (patch)
tree29e46b79d5ca6cfb6925a90b1e8db6e93ab37275
parentbf31aab2c8c2644e8f4d5baedaf2798c9760a0b7 (diff)
downloadlibhardware-3d3a47925366e72b68d9041605c7bbdab95f1d68.tar.gz
Fix extern "C" guards.
Cherry-pick from internal. Change-Id: I11ed50352865a099c3040a1558a48960ae7db416
-rw-r--r--include/hardware/keymaster_defs.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index 45ed4f1f..32374f1d 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <string.h>
-#ifndef __cplusplus
+#ifdef __cplusplus
extern "C" {
#endif // __cplusplus
@@ -507,7 +507,7 @@ inline void keymaster_free_characteristics(keymaster_key_characteristics_t* char
}
}
-#ifndef __cplusplus
+#ifdef __cplusplus
} // extern "C"
#endif // __cplusplus