diff options
| author |  kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2010-01-15 02:28:48 +0000 |
|---|---|---|
| committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2010-01-15 02:28:48 +0000 |
| commit | 529a843f2d4a43dbe6505098108697f30cb1d777 (patch) | |
| tree | c6148e19ad06ddb0c5962049522daf8ad4e11183 /src/google/protobuf/message.h | |
| parent | c25f833baf967e5ddae2e63ec453c84a3cb1cfd6 (diff) | |
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.
Diffstat (limited to 'src/google/protobuf/message.h')
| -rw-r--r-- | src/google/protobuf/message.h | 19 |
1 files changed, 0 insertions, 19 deletions
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 <google/protobuf/stubs/common.h> -#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 { |