diff options
| -rw-r--r-- | include/hardware/hw_auth_token.h | 8 | ||||
| -rw-r--r-- | include/hardware/keymaster_defs.h | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/include/hardware/hw_auth_token.h b/include/hardware/hw_auth_token.h index ffb72a9..154c1fd 100644 --- a/include/hardware/hw_auth_token.h +++ b/include/hardware/hw_auth_token.h @@ -19,7 +19,9 @@ #ifndef ANDROID_HARDWARE_HW_AUTH_TOKEN_H #define ANDROID_HARDWARE_HW_AUTH_TOKEN_H -__BEGIN_DECLS +#ifndef __cplusplus +extern "C" { +#endif // __cplusplus typedef enum { HW_AUTH_NONE = 0, @@ -42,6 +44,8 @@ typedef struct __attribute__((__packed__)) { uint8_t hmac[32]; } hw_auth_token_t; -__END_DECLS +#ifndef __cplusplus +} // extern "C" +#endif // __cplusplus #endif // ANDROID_HARDWARE_HW_AUTH_TOKEN_H diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h index e7ef5b5..664d3a7 100644 --- a/include/hardware/keymaster_defs.h +++ b/include/hardware/keymaster_defs.h @@ -21,7 +21,9 @@ #include <stdlib.h> #include <string.h> -__BEGIN_DECLS +#ifndef __cplusplus +extern "C" { +#endif // __cplusplus /** * Authorization tags each have an associated type. This enumeration facilitates tagging each with @@ -546,6 +548,8 @@ inline void keymaster_free_characteristics(keymaster_key_characteristics_t* char } } -__END_DECLS +#ifndef __cplusplus +} // extern "C" +#endif // __cplusplus #endif // ANDROID_HARDWARE_KEYMASTER_DEFS_H |