diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2005-02-10 01:19:43 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2005-02-10 01:19:43 +0000 |
| commit | 78a04600f9b2dac96b06e26a62fc34becdcc6ffb (patch) | |
| tree | 2bf1721961a20b24ea5cf479af5d7658c52462b6 /winsup/w32api/lib/directx/dinput_joy.c | |
| parent | 9631b700f9943cfcbdef90dbbc14315368c6b15a (diff) | |
| download | cygnal-78a04600f9b2dac96b06e26a62fc34becdcc6ffb.tar.gz cygnal-78a04600f9b2dac96b06e26a62fc34becdcc6ffb.tar.bz2 cygnal-78a04600f9b2dac96b06e26a62fc34becdcc6ffb.zip | |
2005-02-10 Jiri Malak <Jiri.Malak@iol.cz>
Danny Smith <dannysmith@users.sourceforge.net>
* lib/directx/dinput_private.h (ATTRIBUTE_TEXT_SECTION): New
define for Open Watcom portability.
* lib/directx/(dinput_joy.c, dinput_joy2.c, dinput_kbd.c,
dinput_mouse.c, dinput_mouse2.c): Use new macro in definition
of local c_rgodfDI* objects. Replace .rdata section attribute
with 'const' keyword in definition of global c_dfDI* objects.
Diffstat (limited to 'winsup/w32api/lib/directx/dinput_joy.c')
| -rw-r--r-- | winsup/w32api/lib/directx/dinput_joy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/winsup/w32api/lib/directx/dinput_joy.c b/winsup/w32api/lib/directx/dinput_joy.c index 6c88d575b..e2a6f9fce 100644 --- a/winsup/w32api/lib/directx/dinput_joy.c +++ b/winsup/w32api/lib/directx/dinput_joy.c @@ -12,7 +12,7 @@ #include "dinput_private.h" -static DIOBJECTDATAFORMAT c_rgodfDIJoy[] __attribute__ ((section(".text"))) = +static DIOBJECTDATAFORMAT ATTRIBUTE_TEXT_SECTION c_rgodfDIJoy[] = { {&GUID_XAxis,0x0,DIDFT_ABSAXIS|DIDFT_RELAXIS|DIDFT_ANYINSTANCE|DIDFT_OPTIONAL,DIDOI_ASPECTPOSITION}, {&GUID_YAxis,0x4,DIDFT_ABSAXIS|DIDFT_RELAXIS|DIDFT_ANYINSTANCE|DIDFT_OPTIONAL,DIDOI_ASPECTPOSITION}, @@ -60,4 +60,4 @@ static DIOBJECTDATAFORMAT c_rgodfDIJoy[] __attribute__ ((section(".text"))) = {NULL,0x4f,DIDFT_BUTTON|DIDFT_ANYINSTANCE|DIDFT_OPTIONAL,0x0} }; -DIDATAFORMAT c_dfDIJoystick __attribute__ ((section(".rdata"))) = {sizeof(DIDATAFORMAT),sizeof(DIOBJECTDATAFORMAT),DIDF_ABSAXIS,80,sizeof(c_rgodfDIJoy)/sizeof(c_rgodfDIJoy[0]),c_rgodfDIJoy}; +const DIDATAFORMAT c_dfDIJoystick = {sizeof(DIDATAFORMAT),sizeof(DIOBJECTDATAFORMAT),DIDF_ABSAXIS,80,sizeof(c_rgodfDIJoy)/sizeof(c_rgodfDIJoy[0]),c_rgodfDIJoy}; |