pkg/33847: math/cln solaris amd64

["Gilles Dauphin" <dauphin%enst.fr@localhost>]

>Number:         33847
>Category:       pkg
>Synopsis:       math/cln solaris amd64
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Jun 28 13:55:00 +0000 2006
>Originator:     Gilles Dauphin
>Release:        SunOS 5.10 i86pc
>Organization:
ENST 
>Environment:


System: SunOS bi.enst.fr 5.10 Generic_Patch_118844-30 i86pc


>Description:


 g++ -O -I../include -I./base -I./base/digit -I./base/random -Ibase -c 
./base/digitseq/cl_2DS_div.cc  -fPIC -DPIC -o .libs/cl_2DS_div.o -D_XPG4_2 
-U__EXTENSION__
In file included from ./base/digitseq/cl_2DS_div.cc:13:
./base/digitseq/cl_DS.h:50: error: expected identifier before numeric constant
./base/digitseq/cl_DS.h:50: error: expected unqualified-id before numeric 
constant
./base/digitseq/cl_DS.h:50: error: expected `,' or `;' before numeric constant
In file included from ./base/digitseq/cl_2DS_div.cc:13:
./base/digitseq/cl_DS.h:2652: error: expected identifier before numeric constant
./base/digitseq/cl_DS.h:2652: error: expected `,' or `...' before numeric 
constant
./base/digitseq/cl_DS.h:2652: error: ISO C++ forbids declaration of `parameter' 
with no type
./base/digitseq/cl_DS.h:2670: error: expected identifier before numeric constant
./base/digitseq/cl_DS.h:2670: error: expected `,' or `...' before numeric 
constant
./base/digitseq/cl_DS.h:2670: error: ISO C++ forbids declaration of `parameter' 
with no type



>How-To-Repeat:


bmake


>Fix:


--- src/base/digitseq/cl_DS.h.orig      Mon May  6 12:28:43 2002
+++ src/base/digitseq/cl_DS.h   Wed Jun 28 15:16:09 2006
@@ -47,6 +47,12 @@
 #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)(byt
e1)<<48)|((uintD)(byte2)<<40)|((uintD)(byte3)<<32)|((uintD)(byte4)<<24)|((uintD)(byte5)<<16)|((u
intD)(byte6)<<8)|((uintD)(byte7)))
 
+/* DS is define in regset.h for Solaris i386. that is include via signal.h */
+/* DS is the name of a amd64 extended register and is not use here */
+/* It is safe to undef. GD 2006/06/28 */
+#if defined(DS)
+#undef DS
+#endif
 struct DS {
        uintD* MSDptr;
        unsigned int len;