* src/base/digitseq/cl_DS.h: #undef DS, needed for i386-Solaris.

diff --git a/ChangeLog b/ChangeLog
index ccea5a40d2737993d463e36a60538df16af59352..e536e846b4ea122c798fb846c8fb139b4d6b99a1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-02  Richard B. Kreckel  <kreckel@ginac.de>
+
+       * src/base/digitseq/cl_DS.h: #undef DS, needed for i386-Solaris.
+
 2006-10-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * tests/Makefile.in (VPATH): Fix syntax error.

diff --git a/src/base/digitseq/cl_DS.h b/src/base/digitseq/cl_DS.h
index ddbf4a3bc368bb36dac982e1ade55418b9caa3ca..76fbad375dc608787f18481c7ea4460056d1aefc 100644 (file)
--- a/src/base/digitseq/cl_DS.h
+++ b/src/base/digitseq/cl_DS.h
@@ -47,6 +47,10 @@ namespace cln {
 #define D4(byte0,byte1,byte2,byte3)  (((uintD)(byte0)<<24)|((uintD)(byte1)<<16)|((uintD)(byte2)<<8)|((uintD)(byte3)))
 #define D8(byte0,byte1,byte2,byte3,byte4,byte5,byte6,byte7)  (((uintD)(byte0)<<56)|((uintD)(byte1)<<48)|((uintD)(byte2)<<40)|((uintD)(byte3)<<32)|((uintD)(byte4)<<24)|((uintD)(byte5)<<16)|((uintD)(byte6)<<8)|((uintD)(byte7)))
 
+// i386-pc-solaris #defines DS.
+// Grr...
+#undef DS
+
 struct DS {
        uintD* MSDptr;
        uintC len;