diff options
| author | Shawn Willden <swillden@google.com> | 2015-03-18 18:59:52 -0600 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2015-03-18 19:25:01 -0600 |
| commit | c51d01ed029458e8809eeb9c16f9ed2dbe755be4 (patch) | |
| tree | b185982f6a6cfe500170e81a0a76216a9e31644e | |
| parent | 201e5555b336bb5f9db7dd3215e8d6135ed5f146 (diff) | |
| download | hardware_libhardware-c51d01ed029458e8809eeb9c16f9ed2dbe755be4.zip hardware_libhardware-c51d01ed029458e8809eeb9c16f9ed2dbe755be4.tar.gz hardware_libhardware-c51d01ed029458e8809eeb9c16f9ed2dbe755be4.tar.bz2 | |
Use extern "C" rather than BEGIN/END_DECLS.
For compatibility with Trusty. I'll probably revert this later after I
find a proper fix for Trusty.
Change-Id: I49b4ae55251398eec2a6633e09bbc468f16a4d14
| -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 |