diff options
author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-03-06 14:42:59 -0800 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-03-06 14:42:59 -0800 |
commit | 8cb8cb390fd3b193e2e0399cf20d92af04fd13cd (patch) | |
tree | c8a83b80cd4dceeaa27dd97235e02e18aab54740 /plugin | |
parent | 1a750c272683fab37cc7cd4327ccefdfa39faf85 (diff) |
Make plugin build compatible with Firefox 3.1 renaming of npupp.h
Checks which header to include, the older npupp.h or the newer npfunctions.h,
falls back to the ancient copy included from the Netscape SDK if neither are
found in either the default path or the pkg-config provided paths.
See https://bugzilla.mozilla.org/show_bug.cgi?id=455458
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Diffstat (limited to 'plugin')
-rw-r--r-- | plugin/common/npunix.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/plugin/common/npunix.c b/plugin/common/npunix.c index d2b5338..bdc5bf1 100644 --- a/plugin/common/npunix.c +++ b/plugin/common/npunix.c @@ -15,9 +15,14 @@ #define XP_UNIX 1 +#include "config.h" #include <stdio.h> #include "npapi.h" -#include "npupp.h" +#ifdef HAVE_NPFUNCTIONS_H +# include <npfunctions.h> +#else +# include "npupp.h" +#endif /* * Define PLUGIN_TRACE to have the wrapper functions print |