diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-07-06 12:51:42 +0200 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-07-06 12:51:42 +0200 |
| commit | e30aa60a06817ed67c14a80430a7275defc41e76 (patch) | |
| tree | b4bb512416a40578db1f32eb3a7836ddb6f8582d /cparser | |
| parent | aa780c7145a418b4a7264e828258034fc4629313 (diff) | |
| parent | 2f31c1867b75040067a1ef74ae32f197e8d296c1 (diff) | |
| download | compcert-e30aa60a06817ed67c14a80430a7275defc41e76.tar.gz compcert-e30aa60a06817ed67c14a80430a7275defc41e76.zip | |
Merge branch 'master' into json_export
Conflicts:
driver/Driver.ml
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 |