Bug 48483: Fix HPUX bustage for Unix default plugin fix thanks to wtc, r=jdunn,pollmann sr=mscott
This commit is contained in:
pollmann%netscape.com
Родитель
d533f7e957
Коммит
df4d125855
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
|
||||
/*
|
||||
* npapi.h $Revision: 3.7 $
|
||||
* npapi.h $Revision: 3.8 $
|
||||
* Netscape client plug-in API spec
|
||||
*/
|
||||
|
||||
|
|
@ -33,6 +33,13 @@
|
|||
#pragma pack(1)
|
||||
#endif
|
||||
|
||||
/*
|
||||
* NO_NSPR_10_SUPPORT disables the inclusion
|
||||
* of obsolete/protypes.h, whose int16, uint16,
|
||||
* int32, and uint32 typedefs conflict with those
|
||||
* in this file.
|
||||
*/
|
||||
#define NO_NSPR_10_SUPPORT
|
||||
#include "jri.h" /* Java Runtime Interface */
|
||||
|
||||
#if defined (__OS2__ ) || defined (OS2)
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
|
||||
/*
|
||||
* npapi.h $Revision: 3.7 $
|
||||
* npapi.h $Revision: 3.8 $
|
||||
* Netscape client plug-in API spec
|
||||
*/
|
||||
|
||||
|
|
@ -33,6 +33,13 @@
|
|||
#pragma pack(1)
|
||||
#endif
|
||||
|
||||
/*
|
||||
* NO_NSPR_10_SUPPORT disables the inclusion
|
||||
* of obsolete/protypes.h, whose int16, uint16,
|
||||
* int32, and uint32 typedefs conflict with those
|
||||
* in this file.
|
||||
*/
|
||||
#define NO_NSPR_10_SUPPORT
|
||||
#include "jri.h" /* Java Runtime Interface */
|
||||
|
||||
#if defined (__OS2__ ) || defined (OS2)
|
||||
|
|
|
|||
|
|
@ -39,14 +39,6 @@
|
|||
*
|
||||
*/
|
||||
|
||||
|
||||
/* need to define these in order to avoid conflict with those
|
||||
defined in obsolete/prototypes.h (included from prtypes.h), see npapi.h */
|
||||
#define _UINT16
|
||||
#define _UINT32
|
||||
#define _INT16
|
||||
#define _INT32
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include "npapi.h"
|
||||
|
|
|
|||
|
|
@ -37,13 +37,6 @@
|
|||
|
||||
#define XP_UNIX 1
|
||||
|
||||
/* need to define these in order to avoid conflict with those
|
||||
defined in obsolete/prototypes.h (included from prtypes.h), see npapi.h */
|
||||
#define _UINT16
|
||||
#define _UINT32
|
||||
#define _INT16
|
||||
#define _INT32
|
||||
|
||||
#include <stdio.h>
|
||||
#include "npapi.h"
|
||||
#include "npupp.h"
|
||||
|
|
|
|||
|
|
@ -32,14 +32,6 @@
|
|||
*
|
||||
*/
|
||||
|
||||
|
||||
/* need to define these in order to avoid conflict with those
|
||||
defined in obsolete/prototypes.h (included from prtypes.h), see npapi.h */
|
||||
#define _UINT16
|
||||
#define _UINT32
|
||||
#define _INT16
|
||||
#define _INT32
|
||||
|
||||
#include <stdio.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include "npapi.h"
|
||||
|
|
|
|||
|
|
@ -39,14 +39,6 @@
|
|||
*
|
||||
*/
|
||||
|
||||
|
||||
/* need to define these in order to avoid conflict with those
|
||||
defined in obsolete/prototypes.h (included from prtypes.h), see npapi.h */
|
||||
#define _UINT16
|
||||
#define _UINT32
|
||||
#define _INT16
|
||||
#define _INT32
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include "npapi.h"
|
||||
|
|
|
|||
|
|
@ -37,13 +37,6 @@
|
|||
|
||||
#define XP_UNIX 1
|
||||
|
||||
/* need to define these in order to avoid conflict with those
|
||||
defined in obsolete/prototypes.h (included from prtypes.h), see npapi.h */
|
||||
#define _UINT16
|
||||
#define _UINT32
|
||||
#define _INT16
|
||||
#define _INT32
|
||||
|
||||
#include <stdio.h>
|
||||
#include "npapi.h"
|
||||
#include "npupp.h"
|
||||
|
|
|
|||
|
|
@ -32,14 +32,6 @@
|
|||
*
|
||||
*/
|
||||
|
||||
|
||||
/* need to define these in order to avoid conflict with those
|
||||
defined in obsolete/prototypes.h (included from prtypes.h), see npapi.h */
|
||||
#define _UINT16
|
||||
#define _UINT32
|
||||
#define _INT16
|
||||
#define _INT32
|
||||
|
||||
#include <stdio.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include "npapi.h"
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче