From 6f3eccdd4c93e9fc97e07ac106614a249c8b10e3 Mon Sep 17 00:00:00 2001 From: "warren%netscape.com" Date: Mon, 3 Aug 1998 21:53:49 +0000 Subject: [PATCH] Removed ifdef NSPR20 for unix text plugin. git-svn-id: svn://10.0.0.236/trunk@7148 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/include/npapi.h | 5 +---- mozilla/modules/plugin/base/public/npapi.h | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/mozilla/include/npapi.h b/mozilla/include/npapi.h index 4241cba5140..3ae8e364641 100644 --- a/mozilla/include/npapi.h +++ b/mozilla/include/npapi.h @@ -18,6 +18,7 @@ /* + * npapi.h $Revision: 3.5 $ * Netscape client plug-in API spec */ @@ -134,13 +135,11 @@ typedef unsigned short uint16; #endif #ifndef _UINT32 -# ifndef NSPR20 # if defined(__alpha) typedef unsigned int uint32; # else /* __alpha */ typedef unsigned long uint32; # endif /* __alpha */ -# endif /* NSPR20 */ #endif #ifndef _INT16 @@ -148,13 +147,11 @@ typedef short int16; #endif #ifndef _INT32 -# ifndef NSPR20 # if defined(__alpha) typedef int int32; # else /* __alpha */ typedef long int32; # endif /* __alpha */ -# endif /* NSPR20 */ #endif #ifndef FALSE diff --git a/mozilla/modules/plugin/base/public/npapi.h b/mozilla/modules/plugin/base/public/npapi.h index 4241cba5140..3ae8e364641 100644 --- a/mozilla/modules/plugin/base/public/npapi.h +++ b/mozilla/modules/plugin/base/public/npapi.h @@ -18,6 +18,7 @@ /* + * npapi.h $Revision: 3.5 $ * Netscape client plug-in API spec */ @@ -134,13 +135,11 @@ typedef unsigned short uint16; #endif #ifndef _UINT32 -# ifndef NSPR20 # if defined(__alpha) typedef unsigned int uint32; # else /* __alpha */ typedef unsigned long uint32; # endif /* __alpha */ -# endif /* NSPR20 */ #endif #ifndef _INT16 @@ -148,13 +147,11 @@ typedef short int16; #endif #ifndef _INT32 -# ifndef NSPR20 # if defined(__alpha) typedef int int32; # else /* __alpha */ typedef long int32; # endif /* __alpha */ -# endif /* NSPR20 */ #endif #ifndef FALSE