1 Needed to get flash plugin working. 

     2 Will not send upstream.

     3 

     4 diff --git a/dom/plugins/base/npapi.h b/dom/plugins/base/npapi.h

     5 index 0968651..238ffb3 100644

     6 --- a/dom/plugins/base/npapi.h

     7 +++ b/dom/plugins/base/npapi.h

     8 @@ -334,7 +334,7 @@ typedef enum {

     9   *   gcc 3.x generated vtables on UNIX and OSX are incompatible with

    10   *   previous compilers.

    11   */

    12 -#if (defined(XP_UNIX) && defined(__GNUC__) && (__GNUC__ >= 3))

    13 +#if (defined(XP_UNIX) && defined(__GNUC__) && (__GNUC__ >= 3) && !defined(OS_SOLARIS))

    14  #define _NP_ABI_MIXIN_FOR_GCC3 NP_ABI_GCC3_MASK

    15  #else

    16  #define _NP_ABI_MIXIN_FOR_GCC3 0