Mercurial > sdl-ios-xcode
annotate src/video/xbios/SDL_xbios_tveille.h @ 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 |
---|---|
3904
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
1 /* |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
2 SDL - Simple DirectMedia Layer |
4159 | 3 Copyright (C) 1997-2009 Sam Lantinga |
3904
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
4 |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
5 This library is free software; you can redistribute it and/or |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
6 modify it under the terms of the GNU Library General Public |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
7 License as published by the Free Software Foundation; either |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
8 version 2 of the License, or (at your option) any later version. |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
9 |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
10 This library is distributed in the hope that it will be useful, |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
11 but WITHOUT ANY WARRANTY; without even the implied warranty of |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
13 Library General Public License for more details. |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
14 |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
15 You should have received a copy of the GNU Library General Public |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
16 License along with this library; if not, write to the Free |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
18 |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
19 Sam Lantinga |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
20 slouken@libsdl.org |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
21 */ |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
22 #include "SDL_config.h" |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
23 |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
24 /* |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
25 Turbo veille screensaver |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
26 |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
27 Patrice Mandin |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
28 */ |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
29 |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
30 #ifndef _SDL_xbios_tveille_h |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
31 #define _SDL_xbios_tveille_h |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
32 |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
33 #include "SDL_xbios.h" |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
34 |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
35 /*--- Defines ---*/ |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
36 |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
37 #ifndef C_VeiL |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
38 #define C_VeiL 0x5665694CL |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
39 #endif |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
40 |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
41 /*--- Structures ---*/ |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
42 |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
43 typedef struct { |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
44 unsigned long version; |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
45 void (*prg_ptr)(); |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
46 void (*kbd_ptr)(); |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
47 void (*vbl_ptr)(); |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
48 unsigned long vbl_count; |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
49 void (*oldkbd_ptr)(); |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
50 unsigned long off_count; |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
51 unsigned long prg_size; |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
52 unsigned long dummy1[4]; |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
53 unsigned char dummy2; |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
54 unsigned char status; |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
55 unsigned short freq; |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
56 unsigned short dummy3; |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
57 unsigned char clear_first; |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
58 unsigned char enabled; /* 0=enabled, 0xff=disabled */ |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
59 unsigned char serial_redir; |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
60 unsigned char dummy4; |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
61 void (*oldserial_ptr)(); |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
62 } __attribute__((packed)) tveille_t; |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
63 |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
64 /*--- Functions prototypes ---*/ |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
65 |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
66 int SDL_XBIOS_TveillePresent(_THIS); |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
67 void SDL_XBIOS_TveilleDisable(_THIS); |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
68 void SDL_XBIOS_TveilleEnable(_THIS); |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
69 |
d8371d2dc524
Disable TurboVeille screensaver if present
Patrice Mandin <patmandin@gmail.com>
parents:
diff
changeset
|
70 #endif /* _SDL_xbios_tveille_h */ |