diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-03-08 00:03:56 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-03-08 00:03:56 +0000 |
| commit | 9bca298f6d9dadb1f304ad63becfe28a0eda1b0b (patch) | |
| tree | f7090390710aff9cf1cca5469935e4d82cd69add /clang/lib/Frontend/FrontendActions.cpp | |
| parent | 7f928f14f4235e0cb593857aca4fcedea157c4de (diff) | |
| download | bcm5719-llvm-9bca298f6d9dadb1f304ad63becfe28a0eda1b0b.tar.gz bcm5719-llvm-9bca298f6d9dadb1f304ad63becfe28a0eda1b0b.zip | |
Module [extern_c] attribute: inherit to submodules, don't write 'extern "C"'
blocks when building in C mode, and serialize and deserialize the attribute.
llvm-svn: 203317
Diffstat (limited to 'clang/lib/Frontend/FrontendActions.cpp')
| -rw-r--r-- | clang/lib/Frontend/FrontendActions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Frontend/FrontendActions.cpp b/clang/lib/Frontend/FrontendActions.cpp index 70c34b9653d..71baa10e60a 100644 --- a/clang/lib/Frontend/FrontendActions.cpp +++ b/clang/lib/Frontend/FrontendActions.cpp @@ -132,7 +132,7 @@ static void addHeaderInclude(StringRef HeaderName, SmallVectorImpl<char> &Includes, const LangOptions &LangOpts, bool IsExternC) { - if (IsExternC) + if (IsExternC && LangOpts.CPlusPlus) Includes += "extern \"C\" {\n"; if (LangOpts.ObjC1) Includes += "#import \""; @@ -140,7 +140,7 @@ static void addHeaderInclude(StringRef HeaderName, Includes += "#include \""; Includes += HeaderName; Includes += "\"\n"; - if (IsExternC) + if (IsExternC && LangOpts.CPlusPlus) Includes += "}\n"; } |
