From f7693b3d897b90fd3bc2533be002dc0bdcd9f6c2 Mon Sep 17 00:00:00 2001
From: xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e>
Date: Sat, 6 Oct 2012 15:46:47 +0000
Subject: Merge of branch seq-and-or.  See Changelog for details.

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

(limited to 'backend/RTLgenaux.ml')

diff --git a/backend/RTLgenaux.ml b/backend/RTLgenaux.ml
index 0822587f..245b80cd 100644
--- a/backend/RTLgenaux.ml
+++ b/backend/RTLgenaux.ml
@@ -14,7 +14,7 @@ open Camlcoq
 open Switch
 open CminorSel
 
-let more_likely (c: condexpr) (ifso: stmt) (ifnot: stmt) = false
+let more_likely (c: Op.condition) (ifso: stmt) (ifnot: stmt) = false
 
 module IntOrd =
   struct
-- 
cgit