| commit | 3f93d2a9705df0c4c341ac3e75b3751da82c98c6 | [log] [tgz] |
|---|---|---|
| author | Nick Vaccaro <nvaccaro@google.com> | Tue Aug 04 18:58:04 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Aug 04 18:58:04 2015 +0000 |
| tree | 6423ed9662569b1b8a9fd5cc2165efdaf4673b3b | |
| parent | 0a76e80be826cf7928ab554c303d4f9591b59b27 [diff] | |
| parent | 1fd36183bfa2634d5357c055c16130632701158c [diff] |
Merge "libhardware: sensors: update multi hal to support 64bit builds"
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h index 45ed4f1..32374f1 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 @@ } } -#ifndef __cplusplus +#ifdef __cplusplus } // extern "C" #endif // __cplusplus