diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-06-05 16:25:38 +0200 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-06-05 16:26:13 +0200 |
commit | be8855ebe4e5b978971d77df3d40e051d09597a7 (patch) | |
tree | 962b8334dac47a7a3c4b80d60481680ce15bb027 /extensions/source | |
parent | 5eab53585c4ec52fe82f9b45273ca2f35a1fc1ca (diff) |
Some more win64 "fixes"
Change-Id: Id3de720a7ab28499644881e628a18f99121cb3c9
Diffstat (limited to 'extensions/source')
-rw-r--r-- | extensions/source/nsplugin/source/npshell.cxx | 4 | ||||
-rw-r--r-- | extensions/source/nsplugin/source/so_msg.hxx | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx index f9d39f674607..644222d12df4 100644 --- a/extensions/source/nsplugin/source/npshell.cxx +++ b/extensions/source/nsplugin/source/npshell.cxx @@ -506,7 +506,7 @@ NPP_New(NPMIMEType pluginType, This->fWindow = (NPWindow*)NPN_MemAlloc(sizeof(NPWindow)); memset(This->fWindow, 0, sizeof (NPWindow)); This->fMode = mode; - #endif //end of WNT +#endif //end of WNT PLUGIN_MSG msg; memset((char*)&msg, 0, sizeof(PLUGIN_MSG)); msg.msg_id = SO_NEW_INSTANCE; @@ -823,7 +823,7 @@ NPP_StreamAsFile(NPP instance, NPStream *stream, const char* fname) sprintf(msg.url, "file://%s", localPathNew); #endif //end of UNIX #ifdef WNT - msg.wnd_id =(int)(This->fhWnd); + msg.wnd_id =(plugin_Int32)(This->fhWnd); sprintf(msg.url, "file:///%s", localPathNew); DosToUnixPath(msg.url); #endif //endof WNT diff --git a/extensions/source/nsplugin/source/so_msg.hxx b/extensions/source/nsplugin/source/so_msg.hxx index 8a539ed72a87..419dd49053e4 100644 --- a/extensions/source/nsplugin/source/so_msg.hxx +++ b/extensions/source/nsplugin/source/so_msg.hxx @@ -39,7 +39,11 @@ enum msg_type SO_PRINT // 6 }; +#ifdef _WIN64 +#define plugin_Int32 unsigned __int64 +#else #define plugin_Int32 unsigned long int +#endif typedef struct _PLUGIN_MSG { plugin_Int32 msg_id; |