6917N/ANeeded to get flash plugin working.

6917N/AWill not send upstream.

6917N/A

6917N/Adiff --git a/dom/plugins/base/npapi.h b/dom/plugins/base/npapi.h

6917N/Aindex 0968651..238ffb3 100644

6917N/A--- a/dom/plugins/base/npapi.h

6917N/A+++ b/dom/plugins/base/npapi.h

6917N/A@@ -334,7 +334,7 @@ typedef enum {

6917N/A * gcc 3.x generated vtables on UNIX and OSX are incompatible with

6917N/A * previous compilers.

6917N/A */

6917N/A-#if (defined(XP_UNIX) && defined(__GNUC__) && (__GNUC__ >= 3))

6917N/A+#if (defined(XP_UNIX) && defined(__GNUC__) && (__GNUC__ >= 3) && !defined(OS_SOLARIS))

6917N/A #define _NP_ABI_MIXIN_FOR_GCC3 NP_ABI_GCC3_MASK

6917N/A #else

6917N/A #define _NP_ABI_MIXIN_FOR_GCC3 0