Index: inc/rtl/ustring.h
===================================================================
RCS file: /cvs/porting/sal/inc/rtl/ustring.h,v
retrieving revision 1.6
diff -u -r1.6 ustring.h
--- inc/rtl/ustring.h	30 Oct 2001 13:41:07 -0000	1.6
+++ inc/rtl/ustring.h	10 Apr 2003 12:44:21 -0000
@@ -1152,7 +1152,7 @@
     @return
     a pointer to the null-terminated character array.
  */
-sal_Unicode * SAL_CALL rtl_uString_getStr( rtl_uString * str ) SAL_THROW_EXTERN_C();
+sal_Unicode * SAL_CALL rtl_uString_getStr( rtl_uString * const str ) SAL_THROW_EXTERN_C();
 
 /** Create a new string that is the concatenation of two other strings.
 
Index: osl/all/readline.c
===================================================================
RCS file: /cvs/porting/sal/osl/all/readline.c,v
retrieving revision 1.4
diff -u -r1.4 readline.c
--- osl/all/readline.c	1 Jul 2002 13:22:26 -0000	1.4
+++ osl/all/readline.c	10 Apr 2003 12:44:21 -0000
@@ -85,7 +85,7 @@
 /** Helper data and function
 */    
 
-static struct _Buffer
+struct _Buffer
 {
     sal_Char*	m_pMem;
     sal_uInt64  m_Capacity;		 	  // elements possible in buffer
Index: osl/unx/mutex.c
===================================================================
RCS file: /cvs/porting/sal/osl/unx/mutex.c,v
retrieving revision 1.9
diff -u -r1.9 mutex.c
--- osl/unx/mutex.c	17 Oct 2001 16:20:31 -0000	1.9
+++ osl/unx/mutex.c	10 Apr 2003 12:44:23 -0000
@@ -241,7 +241,7 @@
 	};
     
 	/* necessary to get a "oslMutex *" */
-	static oslMutex const globalMutex = (oslMutex) &globalMutexImpl;
+	static oslMutex globalMutex = (oslMutex) &globalMutexImpl;
     
 	return &globalMutex;
 }
Index: osl/unx/system.h
===================================================================
RCS file: /cvs/porting/sal/osl/unx/system.h,v
retrieving revision 1.14.8.1
diff -u -r1.14.8.1 system.h
--- osl/unx/system.h	20 Feb 2003 15:01:37 -0000	1.14.8.1
+++ osl/unx/system.h	10 Apr 2003 12:44:23 -0000
@@ -98,7 +98,9 @@
 #endif
 
 #ifdef LINUX
+#ifndef __USE_GNU
 #define __USE_GNU
+#endif
 #if GLIBC >= 2
 #   include <shadow.h>
 #   include <asm/sigcontext.h>
@@ -248,7 +250,7 @@
 #	define  NO_PTHREAD_PRIORITY
 extern int pthread_cancel(pthread_t);
 extern unsigned int nanosleep(unsigned int);
-#	define  SLEEP_TIMESPEC(timespec)  	(timespec##.tv_sec > 0) ? sleep(timespec##.tv_sec), nanosleep(timespec##.tv_nsec) : nanosleep(timespec##.tv_nsec)
+#	define  SLEEP_TIMESPEC(timespec)  	(timespec.tv_sec > 0) ? sleep(timespec.tv_sec), nanosleep(timespec.tv_nsec) : nanosleep(timespec.tv_nsec)
 #	define  PATH_MAX 					_POSIX_PATH_MAX
 #	define	S_ISSOCK					S_ISFIFO 
 #	define	PTHREAD_SIGACTION 			pthread_sigaction
@@ -438,14 +440,14 @@
 
 #ifndef NORMALIZE_TIMESPEC
 #	define NORMALIZE_TIMESPEC(timespec) \
-  		timespec##.tv_sec  += timespec##.tv_nsec / 1000000000; \
-  		timespec##.tv_nsec %= 1000000000; 
+  		timespec.tv_sec  += timespec.tv_nsec / 1000000000; \
+  		timespec.tv_nsec %= 1000000000; 
 #endif
 
 #ifndef SET_TIMESPEC
 #	define SET_TIMESPEC(timespec, sec, nsec) \
-  		timespec##.tv_sec  = (sec);  \
-  		timespec##.tv_nsec = (nsec); \
+  		timespec.tv_sec  = (sec);  \
+  		timespec.tv_nsec = (nsec); \
 		NORMALIZE_TIMESPEC(timespec);
 #endif
 
Index: rtl/source/strtmpl.c
===================================================================
RCS file: /cvs/porting/sal/rtl/source/strtmpl.c,v
retrieving revision 1.14
diff -u -r1.14 strtmpl.c
--- rtl/source/strtmpl.c	4 Nov 2002 15:36:28 -0000	1.14
+++ rtl/source/strtmpl.c	10 Apr 2003 12:44:28 -0000
@@ -1218,7 +1218,7 @@
 
 /* ----------------------------------------------------------------------- */
 
-IMPL_RTL_STRCODE* SAL_CALL IMPL_RTL_STRINGNAME( getStr )( IMPL_RTL_STRINGDATA* pThis )
+IMPL_RTL_STRCODE* SAL_CALL IMPL_RTL_STRINGNAME( getStr )( IMPL_RTL_STRINGDATA* const pThis )
 {
     return pThis->buffer;
 }
Index: textenc/tcvtutf8.c
===================================================================
RCS file: /cvs/porting/sal/textenc/tcvtutf8.c,v
retrieving revision 1.3.22.1
diff -u -r1.3.22.1 tcvtutf8.c
--- textenc/tcvtutf8.c	28 Jan 2003 14:54:26 -0000	1.3.22.1
+++ textenc/tcvtutf8.c	10 Apr 2003 12:44:30 -0000
@@ -67,14 +67,14 @@
 #include "tenchelp.h"
 #include "unichars.h"
 
-static struct ImplUtf8ToUnicodeContext
+struct ImplUtf8ToUnicodeContext
 {
     sal_uInt32 nUtf32;
     int nShift;
     sal_Bool bCheckBom;
 };
 
-static struct ImplUnicodeToUtf8Context
+struct ImplUnicodeToUtf8Context
 {
     sal_Unicode nHighSurrogate; // 0xFFFF: write BOM
 };