summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid Majnemer <david.majnemer@gmail.com>2014-06-18 23:26:25 +0000
committerDavid Majnemer <david.majnemer@gmail.com>2014-06-18 23:26:25 +0000
commit2e01479f1c4f2648a48dce00c007668fa4763d39 (patch)
tree0afc8d1a68c76dc1fb6952b7c6275f84351e9183 /include
parente15ff8e771874057c02337279f1a43b353797ec0 (diff)
downloadclang-2e01479f1c4f2648a48dce00c007668fa4763d39.tar.gz
clang-2e01479f1c4f2648a48dce00c007668fa4763d39.tar.bz2
clang-2e01479f1c4f2648a48dce00c007668fa4763d39.tar.xz
Sema: Static redeclaration after extern declarations is a Microsoft Extension
CL permits static redeclarations to follow extern declarations. The storage specifier on the latter declaration has no effect. This fixes PR20034. Differential Revision: http://reviews.llvm.org/D4149 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@211238 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
-rw-r--r--include/clang/Basic/DiagnosticSemaKinds.td4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index aa02519087..42117e37a6 100644
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -3814,8 +3814,8 @@ def note_extern_c_global_conflict : Note<
"declared %select{in global scope|with C language linkage}0 here">;
def warn_weak_import : Warning <
"an already-declared variable is made a weak_import declaration %0">;
-def warn_static_non_static : ExtWarn<
- "static declaration of %0 follows non-static declaration">;
+def ext_static_non_static : Extension<
+ "redeclaring non-static %0 as static is a Microsoft extension">, InGroup<Microsoft>;
def err_non_static_static : Error<
"non-static declaration of %0 follows static declaration">;
def err_extern_non_extern : Error<