From c9acadca7c8d5d29dd57b9acba99369067f93ae1 Mon Sep 17 00:00:00 2001
From: xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e>
Date: Wed, 8 Sep 2010 16:50:23 +0000
Subject: Updates for IA32-Cygwin. cparser/Elab.ml: tolerate changes in
 qualifiers in ?: cfrontend/C2C.ml: revise info attached to atoms; treat
 inline functions as static.

git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@1506 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
---
 cparser/Elab.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cparser/Elab.ml')

diff --git a/cparser/Elab.ml b/cparser/Elab.ml
index 2ae7c7e9..b79aa10b 100644
--- a/cparser/Elab.ml
+++ b/cparser/Elab.ml
@@ -1021,7 +1021,7 @@ let elab_expr loc env a =
       | TInt _, TPtr(ty2, a2) when is_literal_0 b2 ->
           { edesc = EConditional(b1, nullconst, b3); etyp = TPtr(ty2, a2) }
       | ty1, ty2 ->
-          match combine_types env ty1 ty2 with
+          match combine_types ~noattrs:true env ty1 ty2 with
           | None ->
               error ("the second and third arguments of '? :' have incompatible types")
           | Some tyres ->
-- 
cgit