diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 2015-06-30 14:49:04 +0200 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 2015-06-30 14:49:04 +0200 |
| commit | d8ed56833c508b5103a900ef04975013bd9ba77b (patch) | |
| tree | c6091bfd87a50a0915ce01629cc96cae1686695c /cparser | |
| parent | bdbf444704c031a37039d4aeb2f19d05550afbd6 (diff) | |
| parent | 19fd986669c098333b88758e85ba146c78a281bf (diff) | |
| download | compcert-kvx-d8ed56833c508b5103a900ef04975013bd9ba77b.tar.gz compcert-kvx-d8ed56833c508b5103a900ef04975013bd9ba77b.zip | |
Merge branch 'master' of https://github.com/AbsInt/CompCert
Diffstat (limited to 'cparser')
| -rw-r--r-- | cparser/Elab.ml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cparser/Elab.ml b/cparser/Elab.ml index aa015b83..d6b79780 100644 --- a/cparser/Elab.ml +++ b/cparser/Elab.ml @@ -1817,6 +1817,7 @@ let enter_or_refine_ident local loc env s sto ty = error loc "static redefinition of '%s' after non-static definition" s; sto | Storage_static,_ -> Storage_static (* Static stays static *) | Storage_extern,_ -> sto + | Storage_default,Storage_extern -> Storage_extern | _,Storage_extern -> old_sto | _,Storage_register | Storage_register,_ -> Storage_register |