From 529a843f2d4a43dbe6505098108697f30cb1d777 Mon Sep 17 00:00:00 2001 From: "kenton@google.com" Date: Fri, 15 Jan 2010 02:28:48 +0000 Subject: Fix issues with Windows build: Always use ASCII version of CreateProcess (even if UNICODE is defined) and move GetMessage macro work-around to common.h so that it covers extension_set.h as well. Patch from Nick Carter. --- src/google/protobuf/message.h | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'src/google/protobuf/message.h') diff --git a/src/google/protobuf/message.h b/src/google/protobuf/message.h index c0062f98..d117fe25 100644 --- a/src/google/protobuf/message.h +++ b/src/google/protobuf/message.h @@ -123,25 +123,6 @@ #include -#if defined(_WIN32) && defined(GetMessage) -// windows.h defines GetMessage() as a macro. Let's re-define it as an inline -// function. This is necessary because Reflection has a method called -// GetMessage() which we don't want overridden. The inline function should be -// equivalent for C++ users. -inline BOOL GetMessage_Win32( - LPMSG lpMsg, HWND hWnd, - UINT wMsgFilterMin, UINT wMsgFilterMax) { - return GetMessage(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax); -} -#undef GetMessage -inline BOOL GetMessage( - LPMSG lpMsg, HWND hWnd, - UINT wMsgFilterMin, UINT wMsgFilterMax) { - return GetMessage_Win32(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax); -} -#endif - - namespace google { namespace protobuf { -- cgit v1.2.3