From 42a820099a1c03b6f0a84e4f16cb983c69309aa5 Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Sat, 12 Mar 2005 04:56:36 +0000 Subject: macros for 64-bit architectures fixes for icc@linux fixes for attribute editor (to deal with large dialogs) fix lines on box text change fix for gcc strangeness no more static assignment of symbols (problems with Metrowerks) fixed bugs in SIMD code for non-power-of-2 lengths fixed shared library versioning lock-free thread management don't depend on ldconfig begin in the system path (should be in /sbin/..) fixed flext::Timer::At method new lock-free lifo and fifo svn path=/trunk/; revision=2619 --- externals/grill/flext/source/flcontainers.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'externals/grill/flext/source/flcontainers.h') diff --git a/externals/grill/flext/source/flcontainers.h b/externals/grill/flext/source/flcontainers.h index a97df172..e1121b63 100644 --- a/externals/grill/flext/source/flcontainers.h +++ b/externals/grill/flext/source/flcontainers.h @@ -44,7 +44,7 @@ public: inline Cell *Avail() { return (Cell *)top; } -#if defined(_MSC_VER) && (defined(_WIN32)) +#if defined(_MSC_VER) && FLEXT_CPU == FLEXT_CPU_IA32 #ifdef __SMP__ #define LOCK lock #else @@ -109,7 +109,7 @@ public: } inline size_t Size() const { return ic-oc; } -#elif defined(__GNUC__) && (defined(_X86_) || defined(__i386__)) +#elif defined(__GNUC__) && FLEXT_CPU == FLEXT_CPU_IA32 #ifndef SMPLOCK # ifdef __SMP__ # define SMPLOCK "lock ; " @@ -180,11 +180,11 @@ public: :"memory", "edx"); return n; } -#elif defined(__GNUC__) && defined(__x86_64__) +#elif defined(__GNUC__) && FLEXT_CPU == FLEXT_CPU_X64_64 #error x86-64 architecture not supported yet -#elif defined(__GNUC__) && defined(__POWERPC__) +#elif defined(__GNUC__) && FLEXT_CPU == FLEXT_CPU_PPC inline void Push(register Cell *cl) { register volatile long t1; -- cgit v1.2.1