menu: added new Keywords tag to .desktop files
[barry.git] / wince / pthreads_patch_20120423.diff
blob775eb4dd87d1823a3cdbd24cf5dc4ab2d64f3365
1 Index: Makefile
2 ===================================================================
3 RCS file: /cvs/pthreads-win32/pthreads/Makefile,v
4 retrieving revision 1.52
5 diff -u -r1.52 Makefile
6 --- Makefile 3 Jul 2011 14:15:58 -0000 1.52
7 +++ Makefile 25 Jun 2012 13:47:51 -0000
8 @@ -11,7 +11,7 @@
9 DLL_VER = 2
10 DLL_VERD= $(DLL_VER)d
12 -DEVROOT = C:\pthreads
13 +DEVROOT = C:\src\pthreads
15 DLLDEST = $(DEVROOT)\dll
16 LIBDEST = $(DEVROOT)\lib
17 @@ -26,7 +26,7 @@
19 CC = cl
20 CPPFLAGS = /I. /DHAVE_PTW32_CONFIG_H
21 -XCFLAGS = /W3 /MD /nologo
22 +XCFLAGS = /W3 /MD /nologo /DWINCE /D_ARM_ /D_UWIN_ /D_UNICODE /DUNICODE /D_WIN32_WCE=0x500 /DUNDER_CE
23 CFLAGS = /O2 /Ob2 $(XCFLAGS)
24 CFLAGSD = /Z7 $(XCFLAGS)
26 @@ -476,7 +476,7 @@
27 copy semaphore.h $(HDRDEST)
29 $(DLLS): $(DLL_OBJS)
30 - $(CC) /LDd /Zi /nologo $(DLL_OBJS) /link /implib:$*.lib $(XLIBS) /out:$@
31 + $(CC) /LDd /Zi /nologo $(DLL_OBJS) /link /implib:$*.lib $(XLIBS) /out:$@ /subsystem:windowsce,5.00 /NODEFAULTLIB:"oldnames.lib" coredll.lib corelibc.lib
33 $(INLINED_STAMPS): $(DLL_INLINED_OBJS)
34 $(CC) /LDd /Zi /nologo $(DLL_INLINED_OBJS) /link /implib:$*.lib $(XLIBS) /out:$*.dll
35 @@ -489,7 +489,7 @@
36 $(CC) $(EHFLAGS) /D$(CLEANUP) -c $<
38 .rc.res:
39 - rc /dPTW32_RC_MSC /d$(CLEANUP) $<
40 + rc /I "c:\Program Files\Windows CE Tools\wce500\STANDARDSDK_500\Include\Armv4i" /dPTW32_RC_MSC /d$(CLEANUP) $<
42 .c.i:
43 $(CC) /P /O2 /Ob1 $(VCFLAGS) $<
44 Index: errno.c
45 ===================================================================
46 RCS file: /cvs/pthreads-win32/pthreads/errno.c,v
47 retrieving revision 1.15
48 diff -u -r1.15 errno.c
49 --- errno.c 22 Nov 2007 14:14:58 -0000 1.15
50 +++ errno.c 25 Jun 2012 13:47:51 -0000
51 @@ -35,9 +35,9 @@
52 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
55 +#include "pthread.h"
56 #if defined(NEED_ERRNO)
58 -#include "pthread.h"
59 #include "implement.h"
61 static int reallyBad = ENOMEM;
62 @@ -84,7 +84,7 @@
64 else
66 - result = (int *)(&self.p->exitStatus);
67 + result = &(((ptw32_thread_t*)self.p)->exitStatus);
70 return (result);
71 Index: mutex.c
72 ===================================================================
73 RCS file: /cvs/pthreads-win32/pthreads/mutex.c,v
74 retrieving revision 1.66
75 diff -u -r1.66 mutex.c
76 --- mutex.c 30 May 2011 00:31:00 -0000 1.66
77 +++ mutex.c 25 Jun 2012 13:47:51 -0000
78 @@ -33,14 +33,13 @@
79 * if not, write to the Free Software Foundation, Inc.,
80 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
83 +#include "pthread.h"
84 #if ! defined(_UWIN) && ! defined(WINCE)
85 # include <process.h>
86 #endif
87 #if !defined(NEED_FTIME)
88 #include <sys/timeb.h>
89 #endif
90 -#include "pthread.h"
91 #include "implement.h"
94 Index: pthread_win32_attach_detach_np.c
95 ===================================================================
96 RCS file: /cvs/pthreads-win32/pthreads/pthread_win32_attach_detach_np.c,v
97 retrieving revision 1.28
98 diff -u -r1.28 pthread_win32_attach_detach_np.c
99 --- pthread_win32_attach_detach_np.c 5 Jul 2011 02:02:35 -0000 1.28
100 +++ pthread_win32_attach_detach_np.c 25 Jun 2012 13:47:52 -0000
101 @@ -70,7 +70,9 @@
103 * This should take care of any security issues.
105 -#if defined(__GNUC__) || _MSC_VER < 1400
106 +#if defined(WINCE)
107 + /* Not supported on WinCE */
108 +#elif defined(__GNUC__) || _MSC_VER < 1400
109 if(GetSystemDirectory(QuserExDLLPathBuf, sizeof(QuserExDLLPathBuf)))
111 (void) strncat(QuserExDLLPathBuf,
112 Index: semaphore.c
113 ===================================================================
114 RCS file: /cvs/pthreads-win32/pthreads/semaphore.c,v
115 retrieving revision 1.37
116 diff -u -r1.37 semaphore.c
117 --- semaphore.c 30 May 2011 00:31:01 -0000 1.37
118 +++ semaphore.c 25 Jun 2012 13:47:52 -0000
119 @@ -45,6 +45,7 @@
120 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
123 +#include "pthread.h"
124 #if !defined(NEED_FTIME)
125 # include <sys/timeb.h>
126 #endif