From 6b2e32351192dd10dd3d671e2b61608c692507e6 Mon Sep 17 00:00:00 2001 From: forsyth Date: Wed, 29 Jun 2011 15:15:08 +0100 Subject: 20110629-1515 --- Linux/386/include/lib9.h | 5 ++++- Linux/arm/include/lib9.h | 7 +++++-- Linux/power/include/lib9.h | 5 ++++- Linux/spim/include/lib9.h | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) (limited to 'Linux') diff --git a/Linux/386/include/lib9.h b/Linux/386/include/lib9.h index a782b4d6..4c26709b 100644 --- a/Linux/386/include/lib9.h +++ b/Linux/386/include/lib9.h @@ -6,6 +6,9 @@ #define _LARGEFILE_SOURCE 1 #define _LARGEFILE64_SOURCE 1 #define _FILE_OFFSET_BITS 64 +#ifdef USE_PTHREADS +#define _REENTRANT 1 +#endif #include #include #include @@ -256,7 +259,7 @@ extern vlong osnsec(void); extern void _assert(char*); extern double charstod(int(*)(void*), void*); extern char* cleanname(char*); -extern ulong getcallerpc(void*); +extern uintptr getcallerpc(void*); extern int getfields(char*, char**, int, int, char*); extern char* getuser(void); extern char* getwd(char*, int); diff --git a/Linux/arm/include/lib9.h b/Linux/arm/include/lib9.h index c76ef660..b3ed6a33 100644 --- a/Linux/arm/include/lib9.h +++ b/Linux/arm/include/lib9.h @@ -6,6 +6,9 @@ #define _LARGEFILE_SOURCE 1 #define _LARGEFILE64_SOURCE 1 #define _FILE_OFFSET_BITS 64 +#ifdef USE_PTHREADS +#define _REENTRANT 1 +#endif #include #include #include @@ -256,7 +259,7 @@ extern vlong osnsec(void); extern void _assert(char*); extern double charstod(int(*)(void*), void*); extern char* cleanname(char*); -//extern ulong getcallerpc(void*); +//extern uintptr getcallerpc(void*); extern int getfields(char*, char**, int, int, char*); extern char* getuser(void); extern char* getwd(char*, int); @@ -455,7 +458,7 @@ extern char *argv0; #define setbinmode() /* need the inline because the link register is not saved in a known location */ -static __inline ulong getcallerpc(void* dummy) { +static __inline uintptr getcallerpc(void* dummy) { ulong lr; __asm__( "mov %0, %%lr;" : "=r" (lr) diff --git a/Linux/power/include/lib9.h b/Linux/power/include/lib9.h index de93d34e..8bd3bf74 100644 --- a/Linux/power/include/lib9.h +++ b/Linux/power/include/lib9.h @@ -6,6 +6,9 @@ #define _LARGEFILE_SOURCE 1 #define _LARGEFILE64_SOURCE 1 #define _FILE_OFFSET_BITS 64 +#ifdef USE_PTHREADS +#define _REENTRANT 1 +#endif #include #include #include @@ -257,7 +260,7 @@ extern vlong osnsec(void); extern void _assert(char*); extern double charstod(int(*)(void*), void*); extern char* cleanname(char*); -extern ulong getcallerpc(void*); +extern uintptr getcallerpc(void*); extern int getfields(char*, char**, int, int, char*); extern char* getuser(void); extern char* getwd(char*, int); diff --git a/Linux/spim/include/lib9.h b/Linux/spim/include/lib9.h index ca034445..8718c294 100644 --- a/Linux/spim/include/lib9.h +++ b/Linux/spim/include/lib9.h @@ -261,7 +261,7 @@ extern vlong osnsec(void); extern void _assert(char*); extern double charstod(int(*)(void*), void*); extern char* cleanname(char*); -extern ulong getcallerpc(void*); +extern uintptr getcallerpc(void*); extern int getfields(char*, char**, int, int, char*); extern char* getuser(void); extern char* getwd(char*, int); -- cgit v1.2.3