Michael Stefaniuc : msvcrtd: Use size_t instead of unsigned long.
Alexandre Julliard
julliard at winehq.org
Wed May 27 09:26:56 CDT 2009
Module: wine
Branch: master
Commit: 37a62a643e457bf8259b2efa31b6939155018180
URL: http://source.winehq.org/git/wine.git/?a=commit;h=37a62a643e457bf8259b2efa31b6939155018180
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Wed May 27 11:36:50 2009 +0200
msvcrtd: Use size_t instead of unsigned long.
---
dlls/msvcrtd/debug.c | 15 +++++++++------
dlls/msvcrtd/tests/debug.c | 2 +-
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/dlls/msvcrtd/debug.c b/dlls/msvcrtd/debug.c
index 0472058..7e2fa0d 100644
--- a/dlls/msvcrtd/debug.c
+++ b/dlls/msvcrtd/debug.c
@@ -31,16 +31,19 @@ int _crtAssertBusy = -1;
int _crtBreakAlloc = -1;
int _crtDbgFlag = 0;
-extern int _callnewh(unsigned long);
+#ifdef _WIN64
+typedef unsigned __int64 MSVCRT_size_t;
+#else
+typedef unsigned long MSVCRT_size_t;
+#endif
+
+extern int _callnewh(MSVCRT_size_t);
/*********************************************************************
* ??2 at YAPAXIHPBDH@Z (MSVCRTD.@)
*/
-void * CDECL MSVCRTD_operator_new_dbg(
- unsigned long nSize,
- int nBlockUse,
- const char *szFileName,
- int nLine)
+void * CDECL MSVCRTD_operator_new_dbg(MSVCRT_size_t nSize, int nBlockUse,
+ const char *szFileName, int nLine)
{
void *retval = NULL;
diff --git a/dlls/msvcrtd/tests/debug.c b/dlls/msvcrtd/tests/debug.c
index fbfcdc5..a7f7db1 100644
--- a/dlls/msvcrtd/tests/debug.c
+++ b/dlls/msvcrtd/tests/debug.c
@@ -30,7 +30,7 @@
/**********************************************************************/
-static void * (*pMSVCRTD_operator_new_dbg)(unsigned long, int, const char *, int) = NULL;
+static void * (*pMSVCRTD_operator_new_dbg)(size_t, int, const char *, int) = NULL;
/* Some exports are only available in later versions */
#define SETNOFAIL(x,y) x = (void*)GetProcAddress(hModule,y)
More information about the wine-cvs
mailing list