Attachment #5561 for issue #13256

View | Details | Raw Unified | Return to issue 13256
Collapse All | Expand All

Lines 1152-1158 Link Here

(-)inc/rtl/ustring.h (-1 / +1 lines)
1152	@return	1152	@return
1153	a pointer to the null-terminated character array.	1153	a pointer to the null-terminated character array.
1154	*/	1154	*/
1155	sal_Unicode * SAL_CALL rtl_uString_getStr( rtl_uString * str ) SAL_THROW_EXTERN_C();	1155	sal_Unicode * SAL_CALL rtl_uString_getStr( rtl_uString * const str ) SAL_THROW_EXTERN_C();
1156		1156
1157	/** Create a new string that is the concatenation of two other strings.	1157	/** Create a new string that is the concatenation of two other strings.
1158		1158

Lines 85-91 Link Here

(-)osl/all/readline.c (-1 / +1 lines)
85	/** Helper data and function	85	/** Helper data and function
86	*/	86	*/
87		87
88	static struct _Buffer	88	struct _Buffer
89	{	89	{
90	sal_Char* m_pMem;	90	sal_Char* m_pMem;
91	sal_uInt64 m_Capacity; // elements possible in buffer	91	sal_uInt64 m_Capacity; // elements possible in buffer

Lines 241-247 Link Here

(-)osl/unx/mutex.c (-1 / +1 lines)
241	};	241	};
242		242
243	/* necessary to get a "oslMutex " /	243	/* necessary to get a "oslMutex " /
244	static oslMutex const globalMutex = (oslMutex) &globalMutexImpl;	244	static oslMutex globalMutex = (oslMutex) &globalMutexImpl;
245		245
246	return &globalMutex;	246	return &globalMutex;
247	}	247	}




#endif

#ifdef LINUX
#ifndef __USE_GNU
#define __USE_GNU
#endif
#if GLIBC >= 2
#   include <shadow.h>
#   include <asm/sigcontext.h>

#	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  PATH_MAX 					_POSIX_PATH_MAX
#	define	S_ISSOCK					S_ISFIFO 
#	define	PTHREAD_SIGACTION 			pthread_sigaction


#ifndef NORMALIZE_TIMESPEC
#	define NORMALIZE_TIMESPEC(timespec) \
  		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); \
		NORMALIZE_TIMESPEC(timespec);
#endif


Lines 1218-1224 Link Here

(-)rtl/source/strtmpl.c (-1 / +1 lines)
1218		1218
1219	/* ----------------------------------------------------------------------- */	1219	/* ----------------------------------------------------------------------- */
1220		1220
1221	IMPL_RTL_STRCODE* SAL_CALL IMPL_RTL_STRINGNAME( getStr )( IMPL_RTL_STRINGDATA* pThis )	1221	IMPL_RTL_STRCODE* SAL_CALL IMPL_RTL_STRINGNAME( getStr )( IMPL_RTL_STRINGDATA* const pThis )
1222	{	1222	{
1223	return pThis->buffer;	1223	return pThis->buffer;
1224	}	1224	}




#include "tenchelp.h"
#include "unichars.h"

struct ImplUtf8ToUnicodeContext
{
    sal_uInt32 nUtf32;
    int nShift;
    sal_Bool bCheckBom;
};

struct ImplUnicodeToUtf8Context
{
    sal_Unicode nHighSurrogate; // 0xFFFF: write BOM
};

Return to issue 13256

Lines 98-104 Link Here

(-)osl/unx/system.h (-5 / +7 lines)
98	#endif	98	#endif
99		99
100	#ifdef LINUX	100	#ifdef LINUX
		101	#ifndef __USE_GNU
101	#define __USE_GNU	102	#define __USE_GNU
		103	#endif
102	#if GLIBC >= 2	104	#if GLIBC >= 2
103	# include <shadow.h>	105	# include <shadow.h>
104	# include <asm/sigcontext.h>	106	# include <asm/sigcontext.h>
Lines 248-254 Link Here
248	# define NO_PTHREAD_PRIORITY	250	# define NO_PTHREAD_PRIORITY
249	extern int pthread_cancel(pthread_t);	251	extern int pthread_cancel(pthread_t);
250	extern unsigned int nanosleep(unsigned int);	252	extern unsigned int nanosleep(unsigned int);
251	# define SLEEP_TIMESPEC(timespec) (timespec##.tv_sec > 0) ? sleep(timespec##.tv_sec), nanosleep(timespec##.tv_nsec) : nanosleep(timespec##.tv_nsec)	253	# define SLEEP_TIMESPEC(timespec) (timespec.tv_sec > 0) ? sleep(timespec.tv_sec), nanosleep(timespec.tv_nsec) : nanosleep(timespec.tv_nsec)
252	# define PATH_MAX _POSIX_PATH_MAX	254	# define PATH_MAX _POSIX_PATH_MAX
253	# define S_ISSOCK S_ISFIFO	255	# define S_ISSOCK S_ISFIFO
254	# define PTHREAD_SIGACTION pthread_sigaction	256	# define PTHREAD_SIGACTION pthread_sigaction
Lines 438-451 Link Here
438		440
439	#ifndef NORMALIZE_TIMESPEC	441	#ifndef NORMALIZE_TIMESPEC
440	# define NORMALIZE_TIMESPEC(timespec) \	442	# define NORMALIZE_TIMESPEC(timespec) \
441	timespec##.tv_sec += timespec##.tv_nsec / 1000000000; \	443	timespec.tv_sec += timespec.tv_nsec / 1000000000; \
442	timespec##.tv_nsec %= 1000000000;	444	timespec.tv_nsec %= 1000000000;
443	#endif	445	#endif
444		446
445	#ifndef SET_TIMESPEC	447	#ifndef SET_TIMESPEC
446	# define SET_TIMESPEC(timespec, sec, nsec) \	448	# define SET_TIMESPEC(timespec, sec, nsec) \
447	timespec##.tv_sec = (sec); \	449	timespec.tv_sec = (sec); \
448	timespec##.tv_nsec = (nsec); \	450	timespec.tv_nsec = (nsec); \
449	NORMALIZE_TIMESPEC(timespec);	451	NORMALIZE_TIMESPEC(timespec);
450	#endif	452	#endif
451		453

Lines 67-80 Link Here

(-)textenc/tcvtutf8.c (-2 / +2 lines)
67	#include "tenchelp.h"	67	#include "tenchelp.h"
68	#include "unichars.h"	68	#include "unichars.h"
69		69
70	static struct ImplUtf8ToUnicodeContext	70	struct ImplUtf8ToUnicodeContext
71	{	71	{
72	sal_uInt32 nUtf32;	72	sal_uInt32 nUtf32;
73	int nShift;	73	int nShift;
74	sal_Bool bCheckBom;	74	sal_Bool bCheckBom;
75	};	75	};
76		76
77	static struct ImplUnicodeToUtf8Context	77	struct ImplUnicodeToUtf8Context
78	{	78	{
79	sal_Unicode nHighSurrogate; // 0xFFFF: write BOM	79	sal_Unicode nHighSurrogate; // 0xFFFF: write BOM
80	};	80	};