tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 6a39dafe: Merge "Use extern "C" rather than BEGIN/END_DECLS."

Browse source 
* commit '6a39dafe872d4e1b3da8df4c4e5e79b66109e3d9':
  Use extern "C" rather than BEGIN/END_DECLS.
This commit is contained in:
Shawn Willden 2015-03-19 01:38:53 +00:00 committed by Android Git Automerger
commit 4dfbc5e320
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/hardware/hw_auth_token.h
View file

@ -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

8
include/hardware/keymaster_defs.h
View file

@ -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