Added the preprocessor directives that define type Z either as long int for 32bit...

diff --git a/src/MEFISTO2/Makefile.in b/src/MEFISTO2/Makefile.in
index 093a7df408ac295b27af4b65d2712d9a5c32d92b..d8a65079e72de266a966e3c747e4acda2b42c08a 100644 (file)
--- a/src/MEFISTO2/Makefile.in
+++ b/src/MEFISTO2/Makefile.in
@@ -42,8 +42,8 @@ LIB_CLIENT_IDL =
 LIB_SERVER_IDL = 
 
 # additionnal information to compil and link file
-CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS)
-CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS)
+CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) @PLATFORM_INCLUDES@
+CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) @PLATFORM_INCLUDES@
 
 LDFLAGS += $(FCLIBS)
 

diff --git a/src/MEFISTO2/Rn.h b/src/MEFISTO2/Rn.h
index 0bb6edf7d8b6dd363a06b908ec018d24e71aa21e..63c6ec26640f6493d403fe2a6daac90852c03eb4 100755 (executable)
--- a/src/MEFISTO2/Rn.h
+++ b/src/MEFISTO2/Rn.h
@@ -62,11 +62,19 @@ typedef char Nom[1+24];
 
 //le type N des nombres entiers positifs
 //=========
+#ifndef PCLINUX64
 typedef unsigned long int N;
+#else 
+typedef unsigned int N;
+#endif
 
 //le type Z des nombres entiers relatifs
 //=========
+#ifndef PCLINUX64
 typedef long int Z;
+#else
+typedef int Z;
+#endif
 
 //le type R des nombres "reels"
 //=========

diff --git a/src/MEFISTO2/aptrte.cxx b/src/MEFISTO2/aptrte.cxx
index 4c550a880434507ac8356f6c8f17df3e7a8259a5..d36ed669ca0f5c179ae9c199a2b4a7594c9a1d52 100755 (executable)
--- a/src/MEFISTO2/aptrte.cxx
+++ b/src/MEFISTO2/aptrte.cxx
@@ -783,6 +783,7 @@ void qualitetrte_( R3 *mnpxyd,
       //un triangle occupe de plus
       nbtria++;
 
+
       //le numero des 3 sommets du triangle nt
       nusotr_( nt, mosoar, mnsoar, moartr, mnartr,  nosotr );