From 78a04600f9b2dac96b06e26a62fc34becdcc6ffb Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Thu, 10 Feb 2005 01:19:43 +0000 Subject: 2005-02-10 Jiri Malak Danny Smith * 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. --- winsup/w32api/lib/directx/dinput_mouse2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'winsup/w32api/lib/directx/dinput_mouse2.c') diff --git a/winsup/w32api/lib/directx/dinput_mouse2.c b/winsup/w32api/lib/directx/dinput_mouse2.c index 89e18a73d..90f46c01b 100644 --- a/winsup/w32api/lib/directx/dinput_mouse2.c +++ b/winsup/w32api/lib/directx/dinput_mouse2.c @@ -12,7 +12,7 @@ #include "dinput_private.h" -static DIOBJECTDATAFORMAT c_rgodfDIMouse2[] __attribute__ ((section(".text"))) = +static DIOBJECTDATAFORMAT ATTRIBUTE_TEXT_SECTION c_rgodfDIMouse2[] = { {&GUID_XAxis,0x0,DIDFT_ABSAXIS|DIDFT_RELAXIS|DIDFT_ANYINSTANCE,0x0}, {&GUID_YAxis,0x4,DIDFT_ABSAXIS|DIDFT_RELAXIS|DIDFT_ANYINSTANCE,0x0}, @@ -27,4 +27,4 @@ static DIOBJECTDATAFORMAT c_rgodfDIMouse2[] __attribute__ ((section(".text"))) = {NULL,0x13,DIDFT_BUTTON|DIDFT_ANYINSTANCE|DIDFT_OPTIONAL,0x0} }; -DIDATAFORMAT c_dfDIMouse2 __attribute__ ((section(".rdata"))) = {sizeof(DIDATAFORMAT),sizeof(DIOBJECTDATAFORMAT),DIDF_RELAXIS,20,sizeof(c_rgodfDIMouse2)/sizeof(c_rgodfDIMouse2[0]),c_rgodfDIMouse2}; +const DIDATAFORMAT c_dfDIMouse2 = {sizeof(DIDATAFORMAT),sizeof(DIOBJECTDATAFORMAT),DIDF_RELAXIS,20,sizeof(c_rgodfDIMouse2)/sizeof(c_rgodfDIMouse2[0]),c_rgodfDIMouse2}; -- cgit v1.2.3