From 7c430a92493f4810d2f8ea41c2a44e4e035dc8dd Mon Sep 17 00:00:00 2001 From: srn Date: Tue, 23 Jan 2007 12:18:22 +0000 Subject: [PATCH] Added the preprocessor directives that define type Z either as long int for 32bit platform or as int for Linux 64bit (Mandriva64) --- src/MEFISTO2/Makefile.in | 4 ++-- src/MEFISTO2/Rn.h | 8 ++++++++ src/MEFISTO2/aptrte.cxx | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/MEFISTO2/Makefile.in b/src/MEFISTO2/Makefile.in index 093a7df40..d8a65079e 100644 --- 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 0bb6edf7d..63c6ec266 100755 --- 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 4c550a880..d36ed669c 100755 --- 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 ); -- 2.39.2