diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-07-16 19:13:01 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-07-16 19:13:01 +0000 |
| commit | 687ca31a1efbaae0b66d2fb006fecd37a800698a (patch) | |
| tree | e5e81682e3b5c7bab0b3f8780d3bf4aaf8cb6b34 /extensions | |
| parent | f5c354bc45f6b4a1332883c8eb3a6a0875b766f2 (diff) | |
INTEGRATION: CWS cmcfixes47 (1.17.32); FILE MERGED
2008/07/14 08:11:36 cmc 1.17.32.2: RESYNC: (1.17-1.18); FILE MERGED
2008/06/06 14:44:47 cmc 1.17.32.1: #i82545# fix firefox plugin on 64bit platforms
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/nsplugin/source/npshell.cxx | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx index a5861b4d0d1a..a626c85530aa 100644 --- a/extensions/source/nsplugin/source/npshell.cxx +++ b/extensions/source/nsplugin/source/npshell.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: npshell.cxx,v $ - * $Revision: 1.18 $ + * $Revision: 1.19 $ * * This file is part of OpenOffice.org. * @@ -77,6 +77,27 @@ #include "boost/scoped_array.hpp" #include "tools/pathutils.hxx" +//http://qa.openoffice.org/issues/show_bug.cgi?id=82545 +//https://bugzilla.mozilla.org/show_bug.cgi?id=241262 +#ifdef UNIX +# ifndef _UINT32 +# if defined(__alpha) || defined(__LP64__) + typedef unsigned int uint32; +# else /* __alpha */ + typedef unsigned long uint32; +# endif +# define _UINT32 +# endif +# ifndef _INT32 +# if defined(__alpha) || defined(__LP64__) + typedef int int32; +# else /* __alpha */ + typedef long int32; +# endif +# define _INT32 +# endif +#endif + #include "npapi.h" #include "npshell.hxx" #include "so_env.hxx" |