From 7a2dff55c52b8a68f778f760dcbce6b3717345e2 Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 14 Sep 2009 14:13:38 +0000 Subject: [PATCH] Use the f2c flag when trte.f is compiled with f2c --- src/MEFISTO2/aptrte.cxx | 12 ++++++++++ src/MEFISTO2/aptrte.h | 51 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/src/MEFISTO2/aptrte.cxx b/src/MEFISTO2/aptrte.cxx index f1579fa3a..9d9e80c5b 100755 --- a/src/MEFISTO2/aptrte.cxx +++ b/src/MEFISTO2/aptrte.cxx @@ -36,7 +36,10 @@ extern "C" MEFISTO2D_EXPORT R #ifdef WIN32 + #ifdef F2C_BUILD + #else __stdcall + #endif #endif areteideale()//( R3 xyz, R3 direction ) { @@ -52,8 +55,11 @@ static double cpunew, cpuold=0; void #ifdef WIN32 +#ifdef F2C_BUILD +#else __stdcall #endif +#endif tempscpu_( double & tempsec ) //Retourne le temps CPU utilise en secondes { @@ -64,8 +70,11 @@ tempscpu_( double & tempsec ) void #ifdef WIN32 +#ifdef F2C_BUILD +#else __stdcall #endif +#endif deltacpu_( R & dtcpu ) //Retourne le temps CPU utilise en secondes depuis le precedent appel { @@ -744,7 +753,10 @@ void aptrte( Z nutysu, R aretmx, } void #ifdef WIN32 +#ifdef F2C_BUILD +#else __stdcall +#endif #endif qualitetrte( R3 *mnpxyd, Z & mosoar, Z & mxsoar, Z *mnsoar, diff --git a/src/MEFISTO2/aptrte.h b/src/MEFISTO2/aptrte.h index 68fb0e63a..a1f11cb80 100755 --- a/src/MEFISTO2/aptrte.h +++ b/src/MEFISTO2/aptrte.h @@ -156,7 +156,10 @@ MEFISTO2D_EXPORT extern "C" { void #ifdef WIN32 +#ifdef F2C_BUILD +#else __stdcall +#endif #endif qualitetrte( R3 *mnpxyd, Z & mosoar, Z & mxsoar, Z *mnsoar, @@ -193,7 +196,10 @@ extern "C" { void extern "C" { void #ifdef WIN32 +#ifdef F2C_BUILD +#else __stdcall +#endif #endif tempscpu( double & tempsec ); } @@ -202,7 +208,10 @@ extern "C" { void extern "C" { void #ifdef WIN32 +#ifdef F2C_BUILD +#else __stdcall +#endif #endif deltacpu( R & dtcpu ); } @@ -212,7 +221,10 @@ extern "C" { void //initialiser le tableau mnsoar pour le hachage des aretes extern "C" {void #ifdef WIN32 +#ifdef F2C_BUILD +#else __stdcall +#endif #endif insoar( Z & mxsomm, Z & mosoar, Z & mxsoar, Z & n1soar, Z * mnsoar ); } @@ -220,14 +232,20 @@ extern "C" {void //mettre a zero les nb entiers de tab extern "C" {void #ifdef WIN32 +#ifdef F2C_BUILD +#else __stdcall +#endif #endif azeroi( Z & nb, Z * tab ); } extern "C" {void #ifdef WIN32 +#ifdef F2C_BUILD +#else __stdcall +#endif #endif fasoar( Z & ns1, Z & ns2, Z & nt1, Z & nt2, Z & nolign, Z & mosoar, Z & mxsoar, Z & n1soar, Z * mnsoar, Z * mnarst, @@ -279,7 +297,10 @@ extern "C" {void //initialisation du tableau letree et ajout dans letree des sommets 1 a nbsomm extern "C" {void #ifdef WIN32 +#ifdef F2C_BUILD +#else __stdcall +#endif #endif teajte( Z & mxsomm, Z & nbsomm, R3 * mnpxyd, R3 * comxmi, R & aretmx, Z & mxtree, Z * letree, @@ -288,7 +309,10 @@ extern "C" {void extern "C" {void #ifdef WIN32 +#ifdef F2C_BUILD +#else __stdcall +#endif #endif tehote( Z & nutysu, Z & nbarpi, Z & mxsomm, Z & nbsomm, R3 * mnpxyd, R3 * comxmi, R & aretmx, @@ -300,7 +324,10 @@ extern "C" {void extern "C" {void #ifdef WIN32 +#ifdef F2C_BUILD +#else __stdcall +#endif #endif tetrte( R3 * comxmi, R & aretmx, Z & nbarpi, Z & mxsomm, R3 * mnpxyd, Z & mxqueu, Z * mnqueu, Z * mntree, @@ -313,7 +340,10 @@ extern "C" {void extern "C" {void #ifdef WIN32 +#ifdef F2C_BUILD +#else __stdcall +#endif #endif aisoar( Z & mosoar, Z & mxsoar, Z * mnsoar, Z & na ); } @@ -321,7 +351,10 @@ extern "C" {void extern "C" {void #ifdef WIN32 +#ifdef F2C_BUILD +#else __stdcall +#endif #endif tedela( R3 * mnpxyd, Z * mnarst, Z & mosoar, Z & mxsoar, Z & n1soar, Z * mnsoar, Z & na, @@ -332,7 +365,10 @@ extern "C" {void extern "C" {void #ifdef WIN32 +#ifdef F2C_BUILD +#else __stdcall +#endif #endif terefr( Z & nbarpi, R3 * mnpxyd, Z & mosoar, Z & mxsoar, Z & n1soar, Z * mnsoar, @@ -346,7 +382,10 @@ extern "C" {void extern "C" {void #ifdef WIN32 +#ifdef F2C_BUILD +#else __stdcall +#endif #endif tesuex( Z & nblf, Z * nulftr, Z & ndtri0, Z & nbsomm, R3 * mnpxyd, Z * mnslig, @@ -358,7 +397,10 @@ extern "C" {void extern "C" {void #ifdef WIN32 +#ifdef F2C_BUILD +#else __stdcall +#endif #endif teamqt( Z & nutysu, R & aretmx, R & airemx, Z * mnarst, Z & mosoar, Z & mxsoar, Z & n1soar, Z * mnsoar, @@ -377,7 +419,10 @@ extern "C" {void extern "C" {void #ifdef WIN32 +#ifdef F2C_BUILD +#else __stdcall +#endif #endif nusotr( Z & nt, Z & mosoar, Z * mnsoar, Z & moartr, Z * mnartr,Z * nosotr ); } @@ -385,7 +430,10 @@ extern "C" {void extern "C" {void #ifdef WIN32 +#ifdef F2C_BUILD +#else __stdcall +#endif #endif qutr2d( R3 & p1, R3 & p2, R3 & p3, R & qualite ); } @@ -393,7 +441,10 @@ extern "C" {void extern "C" { R #ifdef WIN32 +#ifdef F2C_BUILD +#else __stdcall +#endif #endif surtd2( R3 & p1, R3 & p2, R3 & p3 ); } -- 2.39.2