Mercurial > sdl-ios-xcode
annotate src/thread/os2/SDL_systhread.c @ 4427:eada7e321df6 SDL-1.2
Fixed bug #943
Ozkan Sezer 2010-02-06 12:31:06 PST
Hi:
Here are some small fixes for compiling SDL against mingw-w64.
(see http://mingw-w64.sourceforge.net/ . Despite the name, it
supports both win32 and win64.) Two patches, one for SDL-1.2
and one for SDL-1.3 attached.
src/audio/windx5/directx.h and src/video/windx5/directx.h (both
SDL-1.2 and SDL-1.3.) I get compilation errors about some union
not having a member named u1 and alike, because of other system
headers being included before this one and them already defining
DUMMYUNIONNAME and stuff. This header probably assumes that those
stuff are defined in windef.h, but mingw-w64 headers define them
in _mingw.h. Easily fixed by moving NONAMELESSUNION definition to
the top of the file. SDL_dx5yuv.c (SDL-1.2-only) also needs to
include the header before SDL_video.h to avoid the same problem.
src/thread/win32/SDL_systhread.c (both SDL-1.2 and SDL-1.3.) :
The __GNUC__ case for pfnSDL_CurrentBeginThread is 32-bit centric
because _beginthreadex returns uintptr_t, not unsigned long which
is 32 bits in win64. Changing the return type to uintptr_t fixes
it.
Hope these are useful. Thanks.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Wed, 10 Mar 2010 15:04:13 +0000 |
| parents | a1b03ba2fcd0 |
| children |
| rev | line source |
|---|---|
| 1190 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
| 4159 | 3 Copyright (C) 1997-2009 Sam Lantinga |
| 1190 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1190
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
| 1190 | 7 License as published by the Free Software Foundation; either |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1190
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
| 1190 | 9 |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1190
diff
changeset
|
13 Lesser General Public License for more details. |
| 1190 | 14 |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1190
diff
changeset
|
15 You should have received a copy of the GNU Lesser General Public |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1190
diff
changeset
|
16 License along with this library; if not, write to the Free Software |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1190
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 1190 | 18 |
| 19 Sam Lantinga | |
| 20 slouken@libsdl.org | |
| 21 */ | |
|
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
22 #include "SDL_config.h" |
| 1190 | 23 |
| 24 /* OS/2 thread management routines for SDL */ | |
| 25 | |
| 26 #include <process.h> | |
| 27 #define INCL_DOSERRORS | |
| 28 #define INCL_DOSPROCESS | |
| 29 #include <os2.h> | |
| 30 | |
| 31 #include "SDL_thread.h" | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
32 #include "../SDL_systhread.h" |
|
1442
e3242177fe4a
Updated OS/2 build, yay!
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
33 #include "../SDL_thread_c.h" |
| 1190 | 34 |
| 35 typedef struct ThreadStartParms | |
| 36 { | |
| 37 void *args; | |
| 38 pfnSDL_CurrentEndThread pfnCurrentEndThread; | |
| 39 } tThreadStartParms, *pThreadStartParms; | |
| 40 | |
| 41 static void threadfunc(void *pparm) | |
| 42 { | |
| 43 pThreadStartParms pThreadParms = pparm; | |
| 44 pfnSDL_CurrentEndThread pfnCurrentEndThread = NULL; | |
| 45 | |
| 46 // Call the thread function! | |
| 47 SDL_RunThread(pThreadParms->args); | |
| 48 | |
| 49 // Get the current endthread we have to use! | |
| 50 if (pThreadParms) | |
| 51 { | |
| 52 pfnCurrentEndThread = pThreadParms->pfnCurrentEndThread; | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1330
diff
changeset
|
53 SDL_free(pThreadParms); |
| 1190 | 54 } |
| 55 // Call endthread! | |
| 56 if (pfnCurrentEndThread) | |
| 57 (*pfnCurrentEndThread)(); | |
| 58 } | |
| 59 | |
| 60 int SDL_SYS_CreateThread(SDL_Thread *thread, void *args, pfnSDL_CurrentBeginThread pfnBeginThread, pfnSDL_CurrentEndThread pfnEndThread) | |
| 61 { | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1330
diff
changeset
|
62 pThreadStartParms pThreadParms = SDL_malloc(sizeof(tThreadStartParms)); |
| 1190 | 63 if (!pThreadParms) |
| 64 { | |
| 65 SDL_SetError("Not enough memory to create thread"); | |
| 66 return(-1); | |
| 67 } | |
| 68 | |
| 69 // Save the function which we will have to call to clear the RTL of calling app! | |
| 70 pThreadParms->pfnCurrentEndThread = pfnEndThread; | |
| 71 // Also save the real parameters we have to pass to thread function | |
| 72 pThreadParms->args = args; | |
| 73 // Start the thread using the runtime library of calling app! | |
|
1330
450721ad5436
It's now possible to build SDL without any C runtime at all on Windows,
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
74 thread->threadid = thread->handle = (*pfnBeginThread)(threadfunc, NULL, 512*1024, pThreadParms); |
|
1443
9ebbbb4ae53b
Fixed some OpenWatcom warnings
Sam Lantinga <slouken@libsdl.org>
parents:
1442
diff
changeset
|
75 if ((int)thread->threadid <= 0) |
| 1190 | 76 { |
| 77 SDL_SetError("Not enough resources to create thread"); | |
| 78 return(-1); | |
| 79 } | |
| 80 return(0); | |
| 81 } | |
| 82 | |
| 83 void SDL_SYS_SetupThread(void) | |
| 84 { | |
| 85 return; | |
| 86 } | |
| 87 | |
| 88 DECLSPEC Uint32 SDLCALL SDL_ThreadID(void) | |
| 89 { | |
| 90 PTIB tib; | |
| 91 DosGetInfoBlocks(&tib, NULL); | |
| 92 return((Uint32) (tib->tib_ptib2->tib2_ultid)); | |
| 93 } | |
| 94 | |
| 95 void SDL_SYS_WaitThread(SDL_Thread *thread) | |
| 96 { | |
| 97 TID tid = thread->handle; | |
| 98 DosWaitThread(&tid, DCWW_WAIT); | |
| 99 } | |
| 100 | |
| 101 /* WARNING: This function is really a last resort. | |
| 102 * Threads should be signaled and then exit by themselves. | |
| 103 * TerminateThread() doesn't perform stack and DLL cleanup. | |
| 104 */ | |
| 105 void SDL_SYS_KillThread(SDL_Thread *thread) | |
| 106 { | |
| 107 DosKillThread(thread->handle); | |
| 108 } |