From ba086b080a1851fdc272fac0466310229737b629 Mon Sep 17 00:00:00 2001 From: Richard Kreckel Date: Thu, 2 Nov 2006 21:13:31 +0000 Subject: [PATCH] * src/base/digitseq/cl_DS.h: #undef DS, needed for i386-Solaris. --- ChangeLog | 4 ++++ src/base/digitseq/cl_DS.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index ccea5a4..e536e84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-11-02 Richard B. Kreckel + + * src/base/digitseq/cl_DS.h: #undef DS, needed for i386-Solaris. + 2006-10-11 Ralf Wildenhues * tests/Makefile.in (VPATH): Fix syntax error. diff --git a/src/base/digitseq/cl_DS.h b/src/base/digitseq/cl_DS.h index ddbf4a3..76fbad3 100644 --- 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;