From 4543e02e6dec41148d4375d28bf759d94a7736fd Mon Sep 17 00:00:00 2001
From: Ludovic Jacomme <alliance-cvs@asim.lip6.fr>
Date: Thu, 25 Apr 2002 14:16:02 +0000
Subject: [PATCH] Cast foireux.

---
 alliance/src/log/src/log.h         |  4 ++--
 alliance/src/log/src/log_bdd0.c    |  6 +++---
 alliance/src/log/src/log_prefbib.c | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/alliance/src/log/src/log.h b/alliance/src/log/src/log.h
index f85c56c7..3199abc6 100644
--- a/alliance/src/log/src/log.h
+++ b/alliance/src/log/src/log.h
@@ -30,7 +30,7 @@
 
 
 
-/* $Id: log.h,v 1.2 2002/04/03 14:55:08 ludo Exp $ */
+/* $Id: log.h,v 1.3 2002/04/25 14:16:02 ludo Exp $ */
 
 #ifndef LUC_LOG_H
 #define LUC_LOG_H
@@ -370,7 +370,7 @@ pNode one, zero;
   extern    ptype_list * supportPtype_listExpr __P((chain_list *expr));
   extern    chain_list * maxExpr __P((chain_list *expr, int (*func)()));
   extern    chain_list * minExpr __P((chain_list *expr, int (*func)()));
-  extern            void sortExpr __P((chain_list *expr, long (*func)(), int direction));
+  extern            void sortExpr __P((chain_list *expr, int (*func)(), int direction));
   extern             int funcNormExpr __P((chain_list *expr));
   extern            void normExpr __P((chain_list *expr));
   extern            void deleteNumExpr __P((chain_list *expr, int i));
diff --git a/alliance/src/log/src/log_bdd0.c b/alliance/src/log/src/log_bdd0.c
index 85847b48..bf62a876 100644
--- a/alliance/src/log/src/log_bdd0.c
+++ b/alliance/src/log/src/log_bdd0.c
@@ -30,7 +30,7 @@
 
 
 
-#ident "$Id: log_bdd0.c,v 1.1 2002/04/03 13:13:25 ludo Exp $"
+#ident "$Id: log_bdd0.c,v 1.2 2002/04/25 14:16:02 ludo Exp $"
 
 /****************************************************************************/
 /*    Produit : librairie BDD - Gestion de BDD                              */
@@ -1899,13 +1899,13 @@ supportIndexBdd (pt, sens)
     {
       for (i = 0; i <= pt->index - 2; i++)
 	if (tabIndex[i] == 'O')
-	  ret = addchain (ret, i + 2);
+	  ret = addchain (ret, (void *)(i + 2));
     }
   else
     {
       for (i = pt->index - 2; i >= 0; i--)
 	if (tabIndex[i] == 'O')
-	  ret = addchain (ret, i + 2);
+	  ret = addchain (ret, (void *)(i + 2));
     }
   mbkfree (tabIndex);
   return ret;
diff --git a/alliance/src/log/src/log_prefbib.c b/alliance/src/log/src/log_prefbib.c
index 8ec31cd0..308cbb2b 100644
--- a/alliance/src/log/src/log_prefbib.c
+++ b/alliance/src/log/src/log_prefbib.c
@@ -31,7 +31,7 @@
 
 
 
-#ident "$Id: log_prefbib.c,v 1.1 2002/04/03 13:13:25 ludo Exp $"
+#ident "$Id: log_prefbib.c,v 1.2 2002/04/25 14:16:02 ludo Exp $"
 
 /****************************************************************************/
 /*    Produit :  librairie ABL - Gestion de representations prefixees       */
@@ -122,7 +122,7 @@ createExpr (oper)
 {
   /* POUR GNU : le cast (void *)oper a ete enleve' */
   if (oper >= MIN_OPER && oper <= MAX_OPER)
-    return addchain (NULL, (void *) addchain (NULL, oper));
+    return addchain (NULL, (void *) addchain (NULL, (void *)((long)oper)));
   else
     {
       printf ("\ncreateExpr: error - unknown operator %d\n", oper);
@@ -1456,7 +1456,7 @@ minExpr (expr, func)
 void 
 sortExpr (expr, func, direction)
      chain_list *expr;
-     long (*func) ();
+     int (*func) ();
      int direction;
 {
   chain_list *expr1;
@@ -1841,7 +1841,7 @@ simplif10Expr (expr)
 	  }
     }
   
-  printf ("## ERROR in simplif10Expr, %s.%d\n", __FILE__, __LINE__);
+  printf ("## ERROR in simplif10Expr, %s.%d\n", basename(__FILE__), __LINE__);
   exit (-1);
 
 }
@@ -2077,7 +2077,7 @@ PMExprInt (expr, pattern, bind)
 {
   if (ATOM (pattern))
     {
-      ptype_list *find = getptype (*bind, VALUE_ATOM (pattern));
+      ptype_list *find = getptype (*bind, (long)VALUE_ATOM (pattern));
 
       /* le couple existe deja */
 
@@ -2087,7 +2087,7 @@ PMExprInt (expr, pattern, bind)
 	    return (0);
 	}
       else
-	*bind = addptype (*bind, VALUE_ATOM (pattern), expr);
+	*bind = addptype (*bind, (long)VALUE_ATOM (pattern), (void *)expr);
 
       return (1);
     }