Module: wine Branch: master Commit: cb432866d24928651b0a959c5db6870a98ca0163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb432866d24928651b0a959c5d...
Author: Piotr Caban piotr@codeweavers.com Date: Sun Jul 25 12:23:22 2010 +0200
msvcp90: Correctly declare pointers to delete/new functions.
---
dlls/msvcp90/msvcp90.h | 4 ++-- dlls/msvcp90/msvcp90_main.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index fe14e07..c70f1c9 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -23,8 +23,8 @@ typedef unsigned char MSVCP_BOOL; void __cdecl _invalid_parameter(const wchar_t*, const wchar_t*, const wchar_t*, unsigned int, uintptr_t);
-void* (__cdecl *MSVCRT_operator_new)(size_t); -void (__cdecl *MSVCRT_operator_delete)(void*); +extern void* (__cdecl *MSVCRT_operator_new)(size_t); +extern void (__cdecl *MSVCRT_operator_delete)(void*);
/* Copied from dlls/msvcrt/cpp.c */ #ifdef __i386__ /* thiscall functions are i386-specific */ diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index fcf2d24..dd542fc 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -28,6 +28,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(msvcp90);
+void* (__cdecl *MSVCRT_operator_new)(size_t); +void (__cdecl *MSVCRT_operator_delete)(void*); void init_cxx_funcs(void) { HMODULE hmod = GetModuleHandleA("msvcrt.dll");