From 55dca5449fa10b91213fc438fc68fe04a620c744 Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 24 Jun 2009 22:05:48 +0000 Subject: [PATCH] build on osx --- direct/src/plugin_npapi/startup.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/direct/src/plugin_npapi/startup.cxx b/direct/src/plugin_npapi/startup.cxx index 0e5c169f2b..73da353494 100644 --- a/direct/src/plugin_npapi/startup.cxx +++ b/direct/src/plugin_npapi/startup.cxx @@ -96,7 +96,7 @@ void request_ready(P3D_instance *instance) { logfile << "request_ready in " << instance - << " thread = " << GetCurrentThreadId() + // << " thread = " << GetCurrentThreadId() << "\n" << flush; // Since we might be in a sub-thread at this point, use a Windows @@ -255,6 +255,7 @@ NPP_SetWindow(NPP instance, NPWindow *window) { << ", " << window->width << ", " << window->height << "\n" << flush; +#ifdef _WIN32 if (window->type == NPWindowTypeWindow) { // Subclass the window to make it call our own window_proc instead // of whatever window_proc it has already. This is just a dopey @@ -262,6 +263,7 @@ NPP_SetWindow(NPP instance, NPWindow *window) { HWND hwnd = (HWND)window->window; LONG_PTR orig = SetWindowLongPtr(hwnd, GWL_WNDPROC, (LONG_PTR)window_proc); } +#endif // _WIN32 PPInstance *inst = (PPInstance *)(instance->pdata); assert(inst != NULL);