Alexandre Julliard : include: Get rid of the WINE_NO_LONG_AS_INT
ifdefs.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Dec 20 08:55:01 CST 2006
Module: wine
Branch: master
Commit: 80cff47c876c85f761d169f05ef712bb1200bb36
URL: http://source.winehq.org/git/wine.git/?a=commit;h=80cff47c876c85f761d169f05ef712bb1200bb36
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Dec 20 14:26:08 2006 +0100
include: Get rid of the WINE_NO_LONG_AS_INT ifdefs.
---
include/guiddef.h | 2 +-
include/windef.h | 2 +-
include/wine/debug.h | 16 ----------------
include/wine/test.h | 4 ----
include/winnt.h | 2 +-
5 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/include/guiddef.h b/include/guiddef.h
index 507eb5a..f079983 100644
--- a/include/guiddef.h
+++ b/include/guiddef.h
@@ -20,7 +20,7 @@
#define GUID_DEFINED
typedef struct _GUID
{
-#if defined(_MSC_VER) || (defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64))
+#ifdef _MSC_VER
unsigned long Data1;
#else
unsigned int Data1;
diff --git a/include/windef.h b/include/windef.h
index 6106b7a..fd3d423 100644
--- a/include/windef.h
+++ b/include/windef.h
@@ -196,7 +196,7 @@ typedef int INT, *PIN
typedef unsigned int UINT, *PUINT;
typedef float FLOAT, *PFLOAT;
typedef char *PSZ;
-#if defined(_MSC_VER) || (defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64))
+#ifdef _MSC_VER
typedef long *LPLONG;
typedef unsigned long DWORD, *PDWORD, *LPDWORD;
typedef unsigned long ULONG, *PULONG;
diff --git a/include/wine/debug.h b/include/wine/debug.h
index 661f6d6..c1ef2b5 100644
--- a/include/wine/debug.h
+++ b/include/wine/debug.h
@@ -187,11 +187,7 @@ static inline const char *wine_dbgstr_gu
{
if (!id) return "(null)";
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}",
-#endif
id->Data1, id->Data2, id->Data3,
id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3],
id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] );
@@ -200,32 +196,20 @@ static inline const char *wine_dbgstr_gu
static inline const char *wine_dbgstr_point( const POINT *pt )
{
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 );
-#endif
}
static inline const char *wine_dbgstr_size( const SIZE *size )
{
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 );
-#endif
}
static inline const char *wine_dbgstr_rect( const RECT *rect )
{
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,
rect->right, rect->bottom );
-#endif
}
static inline const char *wine_dbgstr_longlong( ULONGLONG ll )
diff --git a/include/wine/test.h b/include/wine/test.h
index 8ef8a31..eed9d1a 100644
--- a/include/wine/test.h
+++ b/include/wine/test.h
@@ -371,11 +371,7 @@ static int run_test( const char *name )
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",
-#endif
name, successes + failures + todo_successes + todo_failures,
todo_successes, failures + todo_failures,
(failures + todo_failures != 1) ? "failures" : "failure" );
diff --git a/include/winnt.h b/include/winnt.h
index 651e507..47653eb 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -319,7 +319,7 @@ typedef VOID *PVOID64;
typedef BYTE BOOLEAN, *PBOOLEAN;
typedef char CHAR, *PCHAR;
typedef short SHORT, *PSHORT;
-#if defined(_MSC_VER) || (defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64))
+#ifdef _MSC_VER
typedef long LONG, *PLONG;
#else
typedef int LONG, *PLONG;
More information about the wine-cvs
mailing list