Commit b1df392f authored by Alexandre Julliard's avatar Alexandre Julliard

Fixed the WINE_NO_STRICT #ifdefs to do the right thing if STRICT is

defined (spotted by Michael Stefaniuc).
parent c14e9ebc
......@@ -32,12 +32,12 @@ struct request_max_size
int pad[16];
};
#if defined(STRICT) || (defined(__WINE__) && !defined(WINE_NO_STRICT))
typedef void *obj_handle_t;
typedef void *user_handle_t;
#else
#ifdef WINE_NO_STRICT
typedef int obj_handle_t;
typedef unsigned int user_handle_t;
#else
typedef void *obj_handle_t;
typedef void *user_handle_t;
#endif
typedef unsigned short atom_t;
......
......@@ -561,14 +561,14 @@ typedef DWORD EXECUTION_STATE;
* we're ready we'll remove the '!defined(__WINE__)' (the equivalent
* of converting it from DECLARE_OLD_HANDLE to DECLARE_HANDLE).
*/
#if defined(__WINE__) && defined(WINE_NO_STRICT)
#ifdef WINE_NO_STRICT
typedef UINT HANDLE;
#else
typedef void *HANDLE;
#endif
typedef HANDLE *PHANDLE, *LPHANDLE;
#if defined(STRICT) || (defined(__WINE__) && !defined(WINE_NO_STRICT))
#if (defined(STRICT) || defined(__WINE__)) && !defined(WINE_NO_STRICT)
#define DECLARE_HANDLE(a) \
typedef struct a##__ { int unused; } *a; \
typedef a *P##a
......
......@@ -48,12 +48,12 @@ struct request_max_size
int pad[16]; /* the max request size is 16 ints */
};
#if defined(STRICT) || (defined(__WINE__) && !defined(WINE_NO_STRICT))
typedef void *obj_handle_t;
typedef void *user_handle_t;
#else
#ifdef WINE_NO_STRICT
typedef int obj_handle_t;
typedef unsigned int user_handle_t;
#else
typedef void *obj_handle_t;
typedef void *user_handle_t;
#endif
typedef unsigned short atom_t;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment