* src/base/digitseq/cl_asm.h: ensure intCsize==16 when including

        m68k Assembler routines.
        * src/base/digitseq/cl_asm_.cc: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 78c06dce18327fbdb69db93bd96df46479ff9dc7..e649984ca223b2f90d26533d0b61733c05f502ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-08  Richard Kreckel  <kreckel@ginac.de>
+
+       * src/base/digitseq/cl_asm.h: ensure intCsize==16 when including
+       m68k Assembler routines.
+       * src/base/digitseq/cl_asm_.cc: Likewise.
+
 2002-05-28  Richard Kreckel  <kreckel@ginac.de>
 
        * Version 1.1.5 released.

diff --git a/src/base/digitseq/cl_asm.h b/src/base/digitseq/cl_asm.h
index 68a109d32f4f3c9a35753dd244d7ea89db491f5f..2bf9b95c7f119bf3ab86a171a74dc1c50a7c55d8 100644 (file)
--- a/src/base/digitseq/cl_asm.h
+++ b/src/base/digitseq/cl_asm.h
@@ -5,7 +5,7 @@
 
 #ifndef NO_ASM
 
-#ifdef __m68k__
+#if defined(__m68k__) && (intCsize==16)
   #include "cl_asm_m68k.h"
 #endif
 
@@ -17,7 +17,7 @@
   #include "cl_asm_sparc64.h"
 #endif
 
-#ifdef __i386__
+#if defined(__i386__)
   #include "cl_asm_i386.h"
 #endif
 
@@ -29,7 +29,7 @@
   #include "cl_asm_hppa.h"
 #endif
 
-#ifdef __arm__
+#if defined(__arm__)
   #include "cl_asm_arm.h"
 #endif
 

diff --git a/src/base/digitseq/cl_asm_.cc b/src/base/digitseq/cl_asm_.cc
index a0ed0d579776ac5960412eaf585b0485b1bc768b..9b5b41701cdd3d17ef2d5619bad838a6ed6e29f9 100644 (file)
--- a/src/base/digitseq/cl_asm_.cc
+++ b/src/base/digitseq/cl_asm_.cc
@@ -5,7 +5,7 @@
 
 #ifndef NO_ASM
 
-#ifdef __m68k__
+#if defined(__m68k__) && (intCsize==16)
   #include "cl_asm_m68k_.cc"
 #endif
 
@@ -17,19 +17,19 @@
   #include "cl_asm_sparc64_.cc"
 #endif
 
-#ifdef __i386__
+#if defined(__i386__)
   #include "cl_asm_i386_.cc"
 #endif
 
-#ifdef __mips__
+#if defined(__mips__)
   #include "cl_asm_mips_.cc"
 #endif
 
-#ifdef __hppa__
+#if defined(__hppa__)
   #include "cl_asm_hppa_.cc"
 #endif
 
-#ifdef __arm__
+#if defined(__arm__)
   #include "cl_asm_arm_.cc"
 #endif