| commit | 0a76e80be826cf7928ab554c303d4f9591b59b27 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Fri Jul 10 11:47:05 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Jul 10 11:47:06 2015 +0000 |
| tree | 29e46b79d5ca6cfb6925a90b1e8db6e93ab37275 | |
| parent | bf31aab2c8c2644e8f4d5baedaf2798c9760a0b7 [diff] | |
| parent | 3d3a47925366e72b68d9041605c7bbdab95f1d68 [diff] |
Merge "Fix extern "C" guards."
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