From e0bb409930b1b7a54b6cf8c96eed79daf849faef Mon Sep 17 00:00:00 2001 From: ageay Date: Fri, 25 Feb 2005 14:51:28 +0000 Subject: [PATCH] To be sure that med_int et TInt are the same. --- src/MEDWrapper/Base/MED_Common.hxx | 6 +++++- src/MEDWrapper/Base/Makefile.in | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/MEDWrapper/Base/MED_Common.hxx b/src/MEDWrapper/Base/MED_Common.hxx index c2ae42522..ed46935b7 100644 --- a/src/MEDWrapper/Base/MED_Common.hxx +++ b/src/MEDWrapper/Base/MED_Common.hxx @@ -148,8 +148,12 @@ namespace MED{ typedef enum {eFAUX, eVRAI} EBooleen ; typedef double TFloat; +#if defined(SUN4SOL2) || defined(PCLINUX) || defined(OSF1_32) || defined(IRIX64_32) || defined(RS6000) || defined(HP9000) typedef int TInt; - +#endif +#if defined(IRIX64) || defined(OSF1) + typedef long TInt; +#endif typedef hid_t TIdt; typedef herr_t TErr; diff --git a/src/MEDWrapper/Base/Makefile.in b/src/MEDWrapper/Base/Makefile.in index ae80425cb..91a72d437 100644 --- a/src/MEDWrapper/Base/Makefile.in +++ b/src/MEDWrapper/Base/Makefile.in @@ -54,7 +54,7 @@ LIB_SRC = \ BIN = BIN_SRC = -CPPFLAGS+= $(BOOST_CPPFLAGS) $(HDF5_INCLUDES) +CPPFLAGS+= $(MED2_INCLUDES) $(BOOST_CPPFLAGS) $(HDF5_INCLUDES) LDFLAGS+= -- 2.39.2