diff options
| author | Mike Reed <reed@google.com> | 2010-01-04 10:18:01 -0500 |
|---|---|---|
| committer | Mike Reed <reed@google.com> | 2010-01-04 10:18:01 -0500 |
| commit | 2c497e64d20a73267eb92ae88fdc51ba2a356b55 (patch) | |
| tree | f4fc374a77f41dc290f140349e60739bebbf269c /include | |
| parent | 93d11b5b461a8677a8e3ffa94260f4f9897070ac (diff) | |
| download | external_skia-2c497e64d20a73267eb92ae88fdc51ba2a356b55.zip external_skia-2c497e64d20a73267eb92ae88fdc51ba2a356b55.tar.gz external_skia-2c497e64d20a73267eb92ae88fdc51ba2a356b55.tar.bz2 | |
refresh from skia/trunk
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkPreConfig.h | 5 | ||||
| -rw-r--r-- | include/views/SkOSWindow_Win.h | 4 | ||||
| -rw-r--r-- | include/xml/SkXMLParser.h | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h index b66c97e..a3106e5 100644 --- a/include/core/SkPreConfig.h +++ b/include/core/SkPreConfig.h @@ -47,6 +47,11 @@ #endif #endif +#ifdef SK_BUILD_FOR_WIN32 + #define SK_RESTRICT + #include "sk_stdint.h" +#endif + ////////////////////////////////////////////////////////////////////// #if !defined(SK_RESTRICT) diff --git a/include/views/SkOSWindow_Win.h b/include/views/SkOSWindow_Win.h index 6d821db..0a70f75 100644 --- a/include/views/SkOSWindow_Win.h +++ b/include/views/SkOSWindow_Win.h @@ -29,8 +29,8 @@ public: static bool PostEvent(SkEvent* evt, SkEventSinkID, SkMSec delay); - static bool WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); - static bool SkOSWindow::QuitOnDeactivate(HWND hWnd); + bool wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); + static bool QuitOnDeactivate(HWND hWnd); enum { SK_WM_SkEvent = WM_APP + 1000, diff --git a/include/xml/SkXMLParser.h b/include/xml/SkXMLParser.h index ddad273..7eccb02 100644 --- a/include/xml/SkXMLParser.h +++ b/include/xml/SkXMLParser.h @@ -92,6 +92,7 @@ private: void reportError(void* parser); }; +#if 0 class SkXMLPullParser { public: SkXMLPullParser(); @@ -157,5 +158,6 @@ private: struct Impl; Impl* fImpl; }; +#endif #endif |