CVS: msp430-libc/include/msp430 mpy32.h, 1.1, 1.2 sys.h, 1.1, 1.2

Update of /cvsroot/mspgcc/msp430-libc/include/msp430
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv19080

Modified Files:
	mpy32.h sys.h 
Log Message:
C++ compability fixes

Index: mpy32.h
===================================================================
RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430/mpy32.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- mpy32.h	7 Dec 2008 22:45:57 -0000	1.1
+++ mpy32.h	10 Dec 2008 22:32:12 -0000	1.2
@@ -91,10 +91,7 @@
 #define __xstr(x)     __str(x)
 #define __str(x)      #x
 
-#ifdef __cplusplus
-extern "C"
-#endif //__cplusplus
-struct
+typedef struct
 {
     volatile unsigned int MPY;          /* 16-bit operand 1 - multiply */
     volatile unsigned int MPYS;         /* 16-bit operand 1 - signed multiply */
@@ -103,7 +100,7 @@
     volatile unsigned int OP2;          /* 16-bit operand 2 */
     volatile unsigned int RESLO;        /* 16x16 result low word */
     volatile unsigned int RESHI;        /* 16x16 result high word */
-    volatile const unsigned int SUMEXT; /* 16x16 sum extension */
+    volatile unsigned int SUMEXT; 		/* 16x16 sum extension */
     volatile unsigned int MPY32L;       /* 32-bit operand 1 - multiply low word */
     volatile unsigned int MPY32H;       /* 32-bit operand 1 - multiply high word */
     volatile unsigned int MPYS32L;      /* 32-bit operand 1 - signed multiply low word */
@@ -119,7 +116,8 @@
     volatile unsigned int RES2;
     volatile unsigned int RES3;         /* 32x32 result 3 - most significant word */
     volatile unsigned int MPY32CTL0;    /* MPY32 control register 0 */
-} mpy32 asm(__xstr(__MSP430_MPY32_BASE__));
+} mpy32_t;
+mpy32_t mpy32 asm(__xstr(__MSP430_MPY32_BASE__));
 #undef  __str
 #undef  __xstr
 #endif  /* __ASSEMBLER__ */

Index: sys.h
===================================================================
RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430/sys.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- sys.h	7 Dec 2008 22:45:57 -0000	1.1
+++ sys.h	10 Dec 2008 22:32:12 -0000	1.2
@@ -120,9 +120,6 @@
 #define __xstr(x)     __str(x)
 #define __str(x)      #x
 
-#ifdef __cplusplus
-extern "C"
-#endif //__cplusplus
 typedef struct
 {
     union


------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you.  Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/