Michael Stefaniuc : include: Make "long" numeric constants LP64/ LLP64 proof (mmddk.h).
Module: wine Branch: master Commit: eefcb584834ce47ad7292ade978a7b41832aaecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=eefcb584834ce47ad7292ade97... Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 8 23:28:01 2011 +0100 include: Make "long" numeric constants LP64/LLP64 proof (mmddk.h). --- include/mmddk.h | 72 +++++++++++++++++++++++++++--------------------------- 1 files changed, 36 insertions(+), 36 deletions(-) diff --git a/include/mmddk.h b/include/mmddk.h index 17366db..d6359ef 100644 --- a/include/mmddk.h +++ b/include/mmddk.h @@ -67,8 +67,8 @@ typedef struct { * - codes from 0 to 0x7FFFFFFF are user defined * - codes from 0x80000000 to 0xFFFFFFFF are reserved for future definition by microsoft */ -#define DRVM_IOCTL_CMD_USER 0x00000000L -#define DRVM_IOCTL_CMD_SYSTEM 0x80000000L +#define DRVM_IOCTL_CMD_USER __MSABI_LONG(0x00000000) +#define DRVM_IOCTL_CMD_SYSTEM __MSABI_LONG(0x80000000) #define DRVM_MAPPER 0x2000 #define DRVM_USER 0x4000 @@ -207,12 +207,12 @@ typedef struct { #define JOY_HW_LASTENTRY 12 /* calibration flags */ -#define JOY_ISCAL_XY 0x00000001l /* XY are calibrated */ -#define JOY_ISCAL_Z 0x00000002l /* Z is calibrated */ -#define JOY_ISCAL_R 0x00000004l /* R is calibrated */ -#define JOY_ISCAL_U 0x00000008l /* U is calibrated */ -#define JOY_ISCAL_V 0x00000010l /* V is calibrated */ -#define JOY_ISCAL_POV 0x00000020l /* POV is calibrated */ +#define JOY_ISCAL_XY __MSABI_LONG(0x00000001) /* XY are calibrated */ +#define JOY_ISCAL_Z __MSABI_LONG(0x00000002) /* Z is calibrated */ +#define JOY_ISCAL_R __MSABI_LONG(0x00000004) /* R is calibrated */ +#define JOY_ISCAL_U __MSABI_LONG(0x00000008) /* U is calibrated */ +#define JOY_ISCAL_V __MSABI_LONG(0x00000010) /* V is calibrated */ +#define JOY_ISCAL_POV __MSABI_LONG(0x00000020) /* POV is calibrated */ /* point of view constants */ #define JOY_POV_NUMDIRS 4 @@ -222,42 +222,42 @@ typedef struct { #define JOY_POVVAL_RIGHT 3 /* Specific settings for joystick hardware */ -#define JOY_HWS_HASZ 0x00000001l /* has Z info? */ -#define JOY_HWS_HASPOV 0x00000002l /* point of view hat present */ -#define JOY_HWS_POVISBUTTONCOMBOS 0x00000004l /* pov done through combo of buttons */ -#define JOY_HWS_POVISPOLL 0x00000008l /* pov done through polling */ -#define JOY_HWS_ISYOKE 0x00000010l /* joystick is a flight yoke */ -#define JOY_HWS_ISGAMEPAD 0x00000020l /* joystick is a game pad */ -#define JOY_HWS_ISCARCTRL 0x00000040l /* joystick is a car controller */ +#define JOY_HWS_HASZ __MSABI_LONG(0x00000001) /* has Z info? */ +#define JOY_HWS_HASPOV __MSABI_LONG(0x00000002) /* point of view hat present */ +#define JOY_HWS_POVISBUTTONCOMBOS __MSABI_LONG(0x00000004) /* pov done through combo of buttons */ +#define JOY_HWS_POVISPOLL __MSABI_LONG(0x00000008) /* pov done through polling */ +#define JOY_HWS_ISYOKE __MSABI_LONG(0x00000010) /* joystick is a flight yoke */ +#define JOY_HWS_ISGAMEPAD __MSABI_LONG(0x00000020) /* joystick is a game pad */ +#define JOY_HWS_ISCARCTRL __MSABI_LONG(0x00000040) /* joystick is a car controller */ /* X defaults to J1 X axis */ -#define JOY_HWS_XISJ1Y 0x00000080l /* X is on J1 Y axis */ -#define JOY_HWS_XISJ2X 0x00000100l /* X is on J2 X axis */ -#define JOY_HWS_XISJ2Y 0x00000200l /* X is on J2 Y axis */ +#define JOY_HWS_XISJ1Y __MSABI_LONG(0x00000080) /* X is on J1 Y axis */ +#define JOY_HWS_XISJ2X __MSABI_LONG(0x00000100) /* X is on J2 X axis */ +#define JOY_HWS_XISJ2Y __MSABI_LONG(0x00000200) /* X is on J2 Y axis */ /* Y defaults to J1 Y axis */ -#define JOY_HWS_YISJ1X 0x00000400l /* Y is on J1 X axis */ -#define JOY_HWS_YISJ2X 0x00000800l /* Y is on J2 X axis */ -#define JOY_HWS_YISJ2Y 0x00001000l /* Y is on J2 Y axis */ +#define JOY_HWS_YISJ1X __MSABI_LONG(0x00000400) /* Y is on J1 X axis */ +#define JOY_HWS_YISJ2X __MSABI_LONG(0x00000800) /* Y is on J2 X axis */ +#define JOY_HWS_YISJ2Y __MSABI_LONG(0x00001000) /* Y is on J2 Y axis */ /* Z defaults to J2 Y axis */ -#define JOY_HWS_ZISJ1X 0x00002000l /* Z is on J1 X axis */ -#define JOY_HWS_ZISJ1Y 0x00004000l /* Z is on J1 Y axis */ -#define JOY_HWS_ZISJ2X 0x00008000l /* Z is on J2 X axis */ +#define JOY_HWS_ZISJ1X __MSABI_LONG(0x00002000) /* Z is on J1 X axis */ +#define JOY_HWS_ZISJ1Y __MSABI_LONG(0x00004000) /* Z is on J1 Y axis */ +#define JOY_HWS_ZISJ2X __MSABI_LONG(0x00008000) /* Z is on J2 X axis */ /* POV defaults to J2 Y axis, if it is not button based */ -#define JOY_HWS_POVISJ1X 0x00010000l /* pov done through J1 X axis */ -#define JOY_HWS_POVISJ1Y 0x00020000l /* pov done through J1 Y axis */ -#define JOY_HWS_POVISJ2X 0x00040000l /* pov done through J2 X axis */ +#define JOY_HWS_POVISJ1X __MSABI_LONG(0x00010000) /* pov done through J1 X axis */ +#define JOY_HWS_POVISJ1Y __MSABI_LONG(0x00020000) /* pov done through J1 Y axis */ +#define JOY_HWS_POVISJ2X __MSABI_LONG(0x00040000) /* pov done through J2 X axis */ /* R defaults to J2 X axis */ -#define JOY_HWS_HASR 0x00080000l /* has R (4th axis) info */ -#define JOY_HWS_RISJ1X 0x00100000l /* R done through J1 X axis */ -#define JOY_HWS_RISJ1Y 0x00200000l /* R done through J1 Y axis */ -#define JOY_HWS_RISJ2Y 0x00400000l /* R done through J2 X axis */ +#define JOY_HWS_HASR __MSABI_LONG(0x00080000) /* has R (4th axis) info */ +#define JOY_HWS_RISJ1X __MSABI_LONG(0x00100000) /* R done through J1 X axis */ +#define JOY_HWS_RISJ1Y __MSABI_LONG(0x00200000) /* R done through J1 Y axis */ +#define JOY_HWS_RISJ2Y __MSABI_LONG(0x00400000) /* R done through J2 X axis */ /* U & V for future hardware */ -#define JOY_HWS_HASU 0x00800000l /* has U (5th axis) info */ -#define JOY_HWS_HASV 0x01000000l /* has V (6th axis) info */ +#define JOY_HWS_HASU __MSABI_LONG(0x00800000) /* has U (5th axis) info */ +#define JOY_HWS_HASV __MSABI_LONG(0x01000000) /* has V (6th axis) info */ /* Usage settings */ -#define JOY_US_HASRUDDER 0x00000001l /* joystick configured with rudder */ -#define JOY_US_PRESENT 0x00000002l /* is joystick actually present? */ -#define JOY_US_ISOEM 0x00000004l /* joystick is an OEM defined type */ +#define JOY_US_HASRUDDER __MSABI_LONG(0x00000001) /* joystick configured with rudder */ +#define JOY_US_PRESENT __MSABI_LONG(0x00000002) /* is joystick actually present? */ +#define JOY_US_ISOEM __MSABI_LONG(0x00000004) /* joystick is an OEM defined type */ /* struct for storing x,y, z, and rudder values */
participants (1)
-
Alexandre Julliard