diff options
| author | Doug Zongker <dougz@android.com> | 2012-04-12 21:55:53 +0200 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-04-12 21:55:53 +0200 |
| commit | f69d40afa190a2b6938979fe10760c74a8cc55b3 (patch) | |
| tree | 2baab2cc48f015a294f53a71ea60daa8c87c50e9 /edify/expr.h | |
| parent | Merge "Add NOTICE file" (diff) | |
| parent | minor recovery changes (diff) | |
| download | android_bootable_recovery-f69d40afa190a2b6938979fe10760c74a8cc55b3.tar android_bootable_recovery-f69d40afa190a2b6938979fe10760c74a8cc55b3.tar.gz android_bootable_recovery-f69d40afa190a2b6938979fe10760c74a8cc55b3.tar.bz2 android_bootable_recovery-f69d40afa190a2b6938979fe10760c74a8cc55b3.tar.lz android_bootable_recovery-f69d40afa190a2b6938979fe10760c74a8cc55b3.tar.xz android_bootable_recovery-f69d40afa190a2b6938979fe10760c74a8cc55b3.tar.zst android_bootable_recovery-f69d40afa190a2b6938979fe10760c74a8cc55b3.zip | |
Diffstat (limited to 'edify/expr.h')
| -rw-r--r-- | edify/expr.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/edify/expr.h b/edify/expr.h index 8e1c63872..0d8ed8f57 100644 --- a/edify/expr.h +++ b/edify/expr.h @@ -21,6 +21,10 @@ #include "yydefs.h" +#ifdef __cplusplus +extern "C" { +#endif + #define MAX_STRING_LEN 1024 typedef struct Expr Expr; @@ -152,7 +156,7 @@ Value** ReadValueVarArgs(State* state, int argc, Expr* argv[]); // Use printf-style arguments to compose an error message to put into // *state. Returns NULL. -Value* ErrorAbort(State* state, char* format, ...); +Value* ErrorAbort(State* state, const char* format, ...) __attribute__((format(printf, 2, 3))); // Wrap a string into a Value, taking ownership of the string. Value* StringValue(char* str); @@ -160,4 +164,8 @@ Value* StringValue(char* str); // Free a Value object. void FreeValue(Value* v); +#ifdef __cplusplus +} // extern "C" +#endif + #endif // _EXPRESSION_H |