XFree86 4.3.0.1xf86-4_3_0_1PRE_xf86-4_3_0_1

5 files changed, 19 insertions, 14 deletions

diff --git a/plugin/Main.c b/plugin/Main.c
index 913f235..002c768 100644
--- a/plugin/Main.c
+++ b/plugin/Main.c
@@ -26,6 +26,7 @@ other dealings in this Software without prior written authorization from
 The Open Group.
 
 */
+/* $XFree86: xc/programs/xrx/plugin/Main.c,v 1.8 2001/12/14 20:02:17 dawes Exp $ */
 
 /*
  * RX plug-in module based on the UnixTemplate file provided by Netcape.
@@ -567,9 +568,11 @@ exit:
 void 
 NPP_StreamAsFile(NPP instance, NPStream *stream, const char* fname)
 {
+    /*
     PluginInstance* This;
     if (instance != NULL)
 	This = (PluginInstance*) instance->pdata;
+     */
 }
 
 
@@ -580,7 +583,9 @@ NPP_Print(NPP instance, NPPrint* printInfo)
 	return;
 
     if (instance != NULL) {
+#if 0
 	PluginInstance* This = (PluginInstance*) instance->pdata;
+#endif
 	
 	if (printInfo->mode == NP_FULL) {
 	    /*
@@ -600,14 +605,17 @@ NPP_Print(NPP instance, NPPrint* printInfo)
 	     *	etc.
 	     */
 
+	    /*
 	    void* platformPrint =
 		printInfo->print.fullPrint.platformPrint;
 	    NPBool printOne =
 		printInfo->print.fullPrint.printOne;
+	     */
 			
 	    /* Do the default*/
 	    printInfo->print.fullPrint.pluginPrinted = FALSE;
 	}
+#if 0
 	else {	/* If not fullscreen, we must be embedded */
 	    /*
 	     * PLUGIN DEVELOPERS:
@@ -626,5 +634,6 @@ NPP_Print(NPP instance, NPPrint* printInfo)
 	    void* platformPrint =
 		printInfo->print.embedPrint.platformPrint;
 	}
+#endif
     }
 }
diff --git a/plugin/PProcess.c b/plugin/PProcess.c
index d2f2faf..788cfdc 100644
--- a/plugin/PProcess.c
+++ b/plugin/PProcess.c
@@ -26,6 +26,7 @@ other dealings in this Software without prior written authorization from
 The Open Group.
 
 */
+/* $XFree86: xc/programs/xrx/plugin/PProcess.c,v 1.6 2001/12/14 20:02:17 dawes Exp $ */
 
 #include "RxPlugin.h"
 #include "XUrls.h"
@@ -84,7 +85,7 @@ GetWindowGeometry(
     if (sizehints) {
 	XGetWMNormalHints (dpy, win, sizehints, &mask);
 
-	if (mask & USPosition|PPosition) {
+	if (mask & (USPosition|PPosition)) {
 	    *x = sizehints->x;
 	    *y = sizehints->y;
 	    *width = sizehints->width;
diff --git a/plugin/include/jri_md.h b/plugin/include/jri_md.h
index 1ba1c64..a7e5e03 100644
--- a/plugin/include/jri_md.h
+++ b/plugin/include/jri_md.h
@@ -4,6 +4,7 @@
  * Java Runtime Interface - Machine Dependent Types
  * Copyright (c) 1996 Netscape Communications Corporation. All rights reserved.
  ******************************************************************************/
+/* $XFree86: xc/programs/xrx/plugin/include/jri_md.h,v 1.3 2001/01/17 23:46:25 dawes Exp $ */
  
 #ifndef JRI_MD_H
 #define JRI_MD_H
@@ -65,7 +66,7 @@ extern "C" {
 #	endif
 
 /* Mac */
-#elif macintosh || Macintosh || THINK_C
+#elif defined(macintosh) || defined(Macintosh) || defined(THINK_C)
 #	if defined(__MWERKS__)				/* Metrowerks */
 #		if !__option(enumsalwaysint)
 #			error You need to define 'Enums Always Int' for your project.
diff --git a/plugin/include/npapi.h b/plugin/include/npapi.h
index 598faa1..888274f 100644
--- a/plugin/include/npapi.h
+++ b/plugin/include/npapi.h
@@ -4,6 +4,7 @@
  *  npapi.h Revision: 1.76
  *  Netscape client plug-in API spec
  */
+/* $XFree86: xc/programs/xrx/plugin/include/npapi.h,v 1.5 2001/07/25 15:05:28 dawes Exp $ */
 
 #ifndef _NPAPI_H_
 #define _NPAPI_H_
@@ -37,21 +38,13 @@
 typedef unsigned short uint16;
 #endif
 #ifndef _UINT32
-#if defined(__alpha)
 typedef unsigned int uint32;
-#else /* __alpha */
-typedef unsigned long uint32;
-#endif /* __alpha */
 #endif
 #ifndef _INT16
 typedef short int16;
 #endif
 #ifndef _INT32
-#if defined(__alpha)
 typedef int int32;
-#else /* __alpha */
-typedef long int32;
-#endif /* __alpha */
 #endif
 
 #ifndef FALSE
@@ -60,9 +53,7 @@ typedef long int32;
 #ifndef TRUE
 #define TRUE (1)
 #endif
-#ifndef NULL
-#define NULL (0L)
-#endif
+#include <stddef.h>
 
 typedef unsigned char	NPBool;
 typedef void*			NPEvent;
diff --git a/plugin/libxrx.man b/plugin/libxrx.man
index 6ceca60..703e7e9 100644
--- a/plugin/libxrx.man
+++ b/plugin/libxrx.man
@@ -23,7 +23,10 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\" 
-.TH LIBXRX 1 "Release 6.4" "X Version 11"
+.\"
+.\" $XFree86: xc/programs/xrx/plugin/libxrx.man,v 1.8 2001/12/14 20:02:17 dawes Exp $
+.\"
+.TH LIBXRX 1 __xorgversion__
 .SH NAME
 libxrx - RX Netscape Navigator Plug-in
 .SH DESCRIPTION