diff options
Diffstat (limited to 'ppapi/cpp')
| -rw-r--r-- | ppapi/cpp/instance.h | 5 | ||||
| -rw-r--r-- | ppapi/cpp/websocket.h | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/ppapi/cpp/instance.h b/ppapi/cpp/instance.h index 838d97b..5e7931c 100644 --- a/ppapi/cpp/instance.h +++ b/ppapi/cpp/instance.h @@ -17,6 +17,11 @@ #include "ppapi/cpp/instance_handle.h" #include "ppapi/cpp/view.h" +// Windows defines 'PostMessage', so we have to undef it. +#ifdef PostMessage +#undef PostMessage +#endif + struct PP_InputEvent; /// The C++ interface to the Pepper API. diff --git a/ppapi/cpp/websocket.h b/ppapi/cpp/websocket.h index a34fdb7..0c72dc0 100644 --- a/ppapi/cpp/websocket.h +++ b/ppapi/cpp/websocket.h @@ -12,6 +12,11 @@ /// This file defines the WebSocket interface providing bi-directional, /// full-duplex, communications over a single TCP socket. +// Windows headers will redefine SendMessage. +#ifdef SendMessage +#undef SendMessage +#endif + namespace pp { class CompletionCallback; |