From e07da6f5a812f95799de4f361faa4db47f77526a Mon Sep 17 00:00:00 2001 From: rpj Date: Wed, 30 Mar 2011 13:13:34 +0000 Subject: *** empty log message *** --- GNUmakefile | 5 +++-- pthread_mutex_consistent.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 6288ded..7b15451 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -48,7 +48,7 @@ CP = cp -f #CP = copy # For cross compiling use e.g. -# make CROSS=i386-mingw32msvc- clean GC-inlined +# make CROSS=x86_64-w64-mingw32- clean GC-inlined CROSS = AR = $(CROSS)ar @@ -58,7 +58,7 @@ CXX = $(CROSS)g++ RANLIB = $(CROSS)ranlib RC = $(CROSS)windres -OPT = $(CLEANUP) -O3 -finline-functions +OPT = $(CLEANUP) -O3 # -finline-functions -findirect-inlining DOPT = $(CLEANUP) -g -O0 XOPT = @@ -556,6 +556,7 @@ $(GC_STATIC_STAMP) $(GCD_STATIC_STAMP): $(DLL_INLINED_OBJS) clean: -$(RM) *~ -$(RM) *.i + -$(RM) *.s -$(RM) *.o -$(RM) *.obj -$(RM) *.exe diff --git a/pthread_mutex_consistent.c b/pthread_mutex_consistent.c index 08572a5..b5dcc15 100755 --- a/pthread_mutex_consistent.c +++ b/pthread_mutex_consistent.c @@ -117,7 +117,7 @@ ptw32_robust_mutex_add(pthread_mutex_t* mutex, pthread_t self) { ptw32_robust_node_t** list; pthread_mutex_t mx = *mutex; - ptw32_thread_t* tp = self.p; + ptw32_thread_t* tp = (ptw32_thread_t*)self.p; ptw32_robust_node_t* robust = mx->robustNode; list = &tp->robustMxList; -- cgit v1.2.3