Prevent code duplication when translating GCC platform defines to MSVC ones.

svn path=/trunk/; revision=34829
This commit is contained in:
Hervé Poussineau 2008-07-27 08:18:07 +00:00
parent 43bf5f1b02
commit f9299e18b2
4 changed files with 43 additions and 23 deletions

View file

@ -79,6 +79,22 @@ DEFINE_GUID (GUID_HID_INTERFACE_HIDPARSE, \
#define IOCTL_HID_SET_DRIVER_CONFIG HID_BUFFER_CTL_CODE(101)
#define IOCTL_HID_GET_MS_GENRE_DESCRIPTOR HID_OUT_CTL_CODE(121)
/* FIXME: these values are wrong! */
#define IOCTL_HID_GET_STRING 0
#define IOCTL_HID_GET_DEVICE_ATTRIBUTES 1
#define IOCTL_HID_GET_DEVICE_DESCRIPTOR 2
#define IOCTL_HID_READ_REPORT 3
#define IOCTL_HID_WRITE_REPORT 4
#define IOCTL_HID_GET_REPORT_DESCRIPTOR 5
typedef enum _HID_STRING_TYPE
{
HID_STRING_INDEXED = 0,
HID_STRING_ID_IMANUFACTURER,
HID_STRING_ID_IPRODUCT,
HID_STRING_ID_ISERIALNUMBER,
HID_STRING_MAX
} HID_STRING_TYPE;
enum DeviceObjectState {
DeviceObjectStarted = 0,

View file

@ -16,21 +16,16 @@
#pragma GCC system_header
#endif
/* translate GCC target defines to MS equivalents. Keep this synchronized
with winnt.h. */
#if defined(__i686__) && !defined(_M_IX86)
#define _M_IX86 600
#elif defined(__i586__) && !defined(_M_IX86)
#define _M_IX86 500
#elif defined(__i486__) && !defined(_M_IX86)
#define _M_IX86 400
#elif defined(__i386__) && !defined(_M_IX86)
#define _M_IX86 300
#ifdef __GNUC__
#include <msvctarget.h>
#endif
#if defined(_M_IX86) && !defined(_X86_)
#define _X86_
#elif defined(_M_ALPHA) && !defined(_ALPHA_)
#define _ALPHA_
#elif defined(_M_ARM) && !defined(_ARM_)
#define _ARM_
#elif defined(_M_PPC) && !defined(_PPC_)
#define _PPC_
#elif defined(_M_MRX000) && !defined(_MIPS_)

View file

@ -4,24 +4,16 @@
#pragma GCC system_header
#endif
/* translate GCC target defines to MS equivalents. Keep this synchronized
with windows.h. */
#if defined(__i686__) && !defined(_M_IX86)
#define _M_IX86 600
#elif defined(__i586__) && !defined(_M_IX86)
#define _M_IX86 500
#elif defined(__i486__) && !defined(_M_IX86)
#define _M_IX86 400
#elif defined(__i386__) && !defined(_M_IX86)
#define _M_IX86 300
#ifdef __GNUC__
#include <msvctarget.h>
#endif
#if defined(_M_IX86) && !defined(_X86_)
#define _X86_
#elif defined(_M_ALPHA) && !defined(_ALPHA_)
#define _ALPHA_
#elif defined(_M_ARM) && !defined(ARM)
#define ARM
#elif defined(_M_ARM) && !defined(_ARM_)
#define _ARM_
#elif defined(_M_PPC) && !defined(_PPC_)
#define _PPC_
#elif defined(_M_MRX000) && !defined(_MIPS_)

View file

@ -0,0 +1,17 @@
#ifndef __GNUC__
#error Unsupported compiler
#endif
/* translate GCC target defines to MS equivalents. */
#if defined(__i686__) && !defined(_M_IX86)
#define _M_IX86 600
#undef __i686__
#elif defined(__i586__) && !defined(_M_IX86)
#define _M_IX86 500
#undef __i586__
#elif defined(__i486__) && !defined(_M_IX86)
#define _M_IX86 400
#undef __i486__
#elif defined(__i386__) && !defined(_M_IX86)
#define _M_IX86 300
#endif