ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

include: Get rid of the WINE_NO_LONG_AS_INT ifdefs.

This commit is contained in:
Alexandre Julliard 2006-12-20 14:26:08 +01:00
parent 6744929428
commit 80cff47c87
5 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/guiddef.h
View File

@ -20,7 +20,7 @@
#define GUID_DEFINED #define GUID_DEFINED
typedef struct _GUID typedef struct _GUID
{ {
#if defined(_MSC_VER) || (defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64)) #ifdef _MSC_VER
unsigned long Data1; unsigned long Data1;
#else #else
unsigned int Data1; unsigned int Data1;

2
include/windef.h
View File

@ -196,7 +196,7 @@ typedef int INT, *PINT, *LPINT;
typedef unsigned int UINT, *PUINT; typedef unsigned int UINT, *PUINT;
typedef float FLOAT, *PFLOAT; typedef float FLOAT, *PFLOAT;
typedef char *PSZ; typedef char *PSZ;
#if defined(_MSC_VER) || (defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64)) #ifdef _MSC_VER
typedef long *LPLONG; typedef long *LPLONG;
typedef unsigned long DWORD, *PDWORD, *LPDWORD; typedef unsigned long DWORD, *PDWORD, *LPDWORD;
typedef unsigned long ULONG, *PULONG; typedef unsigned long ULONG, *PULONG;

16
include/wine/debug.h
View File

@ -187,11 +187,7 @@ static inline const char *wine_dbgstr_guid( const GUID *id )
{ {
if (!id) return "(null)"; if (!id) return "(null)";
if (!((INT_PTR)id >> 16)) return wine_dbg_sprintf( "<guid-0x%04x>", (INT_PTR)id & 0xffff ); if (!((INT_PTR)id >> 16)) return wine_dbg_sprintf( "<guid-0x%04x>", (INT_PTR)id & 0xffff );
#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64)
return wine_dbg_sprintf( "{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
#else
return wine_dbg_sprintf( "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", return wine_dbg_sprintf( "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
#endif
id->Data1, id->Data2, id->Data3, id->Data1, id->Data2, id->Data3,
id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3],
id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] );
@ -200,32 +196,20 @@ static inline const char *wine_dbgstr_guid( const GUID *id )
static inline const char *wine_dbgstr_point( const POINT *pt ) static inline const char *wine_dbgstr_point( const POINT *pt )
{ {
if (!pt) return "(null)"; if (!pt) return "(null)";
#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64)
return wine_dbg_sprintf( "(%ld,%ld)", pt->x, pt->y );
#else
return wine_dbg_sprintf( "(%d,%d)", pt->x, pt->y ); return wine_dbg_sprintf( "(%d,%d)", pt->x, pt->y );
#endif
} }
static inline const char *wine_dbgstr_size( const SIZE *size ) static inline const char *wine_dbgstr_size( const SIZE *size )
{ {
if (!size) return "(null)"; if (!size) return "(null)";
#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64)
return wine_dbg_sprintf( "(%ld,%ld)", size->cx, size->cy );
#else
return wine_dbg_sprintf( "(%d,%d)", size->cx, size->cy ); return wine_dbg_sprintf( "(%d,%d)", size->cx, size->cy );
#endif
} }
static inline const char *wine_dbgstr_rect( const RECT *rect ) static inline const char *wine_dbgstr_rect( const RECT *rect )
{ {
if (!rect) return "(null)"; if (!rect) return "(null)";
#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64)
return wine_dbg_sprintf( "(%ld,%ld)-(%ld,%ld)", rect->left, rect->top, rect->right, rect->bottom );
#else
return wine_dbg_sprintf( "(%d,%d)-(%d,%d)", rect->left, rect->top, return wine_dbg_sprintf( "(%d,%d)-(%d,%d)", rect->left, rect->top,
rect->right, rect->bottom ); rect->right, rect->bottom );
#endif
} }
static inline const char *wine_dbgstr_longlong( ULONGLONG ll ) static inline const char *wine_dbgstr_longlong( ULONGLONG ll )

4
include/wine/test.h
View File

@ -371,11 +371,7 @@ static int run_test( const char *name )
if (winetest_debug) if (winetest_debug)
{ {
#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64)
fprintf( stdout, "%s: %ld tests executed, %ld marked as todo, %ld %s.\n",
#else
fprintf( stdout, "%s: %d tests executed, %d marked as todo, %d %s.\n", fprintf( stdout, "%s: %d tests executed, %d marked as todo, %d %s.\n",
#endif
name, successes + failures + todo_successes + todo_failures, name, successes + failures + todo_successes + todo_failures,
todo_successes, failures + todo_failures, todo_successes, failures + todo_failures,
(failures + todo_failures != 1) ? "failures" : "failure" ); (failures + todo_failures != 1) ? "failures" : "failure" );

2
include/winnt.h
View File

@ -319,7 +319,7 @@ typedef VOID *PVOID64;
typedef BYTE BOOLEAN, *PBOOLEAN; typedef BYTE BOOLEAN, *PBOOLEAN;
typedef char CHAR, *PCHAR; typedef char CHAR, *PCHAR;
typedef short SHORT, *PSHORT; typedef short SHORT, *PSHORT;
#if defined(_MSC_VER) || (defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64)) #ifdef _MSC_VER
typedef long LONG, *PLONG; typedef long LONG, *PLONG;
#else #else
typedef int LONG, *PLONG; typedef int LONG, *PLONG;