From 5a7a80de57c51eaf962f4c6a466681f1b750585f Mon Sep 17 00:00:00 2001 From: "pollmann%netscape.com" Date: Thu, 12 Oct 2000 01:11:38 +0000 Subject: [PATCH] Bug 48483: Fix HPUX bustage for Unix default plugin, fix thanks to wtc (added #ifdef guards to previous checkin per review by wtc, will not affect build) git-svn-id: svn://10.0.0.236/trunk@80988 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/include/npapi.h | 4 +++- mozilla/modules/plugin/base/public/npapi.h | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mozilla/include/npapi.h b/mozilla/include/npapi.h index 17b3d807cdd..923133e3f60 100644 --- a/mozilla/include/npapi.h +++ b/mozilla/include/npapi.h @@ -22,7 +22,7 @@ /* - * npapi.h $Revision: 3.8 $ + * npapi.h $Revision: 3.9 $ * Netscape client plug-in API spec */ @@ -39,7 +39,9 @@ * int32, and uint32 typedefs conflict with those * in this file. */ +#ifndef NO_NSPR_10_SUPPORT #define NO_NSPR_10_SUPPORT +#endif #include "jri.h" /* Java Runtime Interface */ #if defined (__OS2__ ) || defined (OS2) diff --git a/mozilla/modules/plugin/base/public/npapi.h b/mozilla/modules/plugin/base/public/npapi.h index 17b3d807cdd..923133e3f60 100644 --- a/mozilla/modules/plugin/base/public/npapi.h +++ b/mozilla/modules/plugin/base/public/npapi.h @@ -22,7 +22,7 @@ /* - * npapi.h $Revision: 3.8 $ + * npapi.h $Revision: 3.9 $ * Netscape client plug-in API spec */ @@ -39,7 +39,9 @@ * int32, and uint32 typedefs conflict with those * in this file. */ +#ifndef NO_NSPR_10_SUPPORT #define NO_NSPR_10_SUPPORT +#endif #include "jri.h" /* Java Runtime Interface */ #if defined (__OS2__ ) || defined (OS2)