merge XFree86 4.3.0.1 to -CURRENT

10 files changed, 45 insertions, 27 deletions

diff --git a/helper/GetUrl.c b/helper/GetUrl.c
index 04b4c93..e0b9eb0 100644
--- a/helper/GetUrl.c
+++ b/helper/GetUrl.c
@@ -26,6 +26,8 @@ other dealings in this Software without prior written authorization from
 The Open Group.
 
 */
+/* $XFree86: xc/programs/xrx/helper/GetUrl.c,v 1.4 2001/12/14 20:02:16 dawes Exp $ */
+
 /*
  * This file is really split into two major parts where GetUrl is implemented
  * in two completely different ways.
@@ -93,7 +95,7 @@ GetUrl(char *url, char **reply_ret, int *len_ret)
 #include <ctype.h>
 
 /* get definitions for the HTTP protocol */
-#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
+#if !defined(UNIXCPP) || defined(ANSICPP)
 #define TRANS(func) _HttpTrans##func
 #else
 #define TRANS(func) _HttpTrans/**/func
diff --git a/helper/xrx.man b/helper/xrx.man
index fc5d90d..8eb74b2 100644
--- a/helper/xrx.man
+++ b/helper/xrx.man
@@ -23,7 +23,10 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\" 
-.TH XRX 1 "Release 6.4" "X Version 11"
+.\"
+.\" $XFree86: xc/programs/xrx/helper/xrx.man,v 1.7 2001/12/14 20:02:16 dawes Exp $
+.\"
+.TH XRX 1 __xorgversion__
 .SH NAME
 xrx - RX helper program
 .SH SYNOPSIS
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
diff --git a/rx/Prefs.c b/rx/Prefs.c
index 428cf62..5f3e5c0 100644
--- a/rx/Prefs.c
+++ b/rx/Prefs.c
@@ -26,12 +26,17 @@ other dealings in this Software without prior written authorization from
 The Open Group.
 
 */
+/* $XFree86: xc/programs/xrx/rx/Prefs.c,v 1.6 2001/12/14 20:02:19 dawes Exp $ */
 
 #include "Prefs.h"
 #include <ctype.h>
 #include "RxI.h"		/* for Malloc & Free */
 #include <X11/StringDefs.h>
+#ifndef Lynx
 #include <sys/socket.h>
+#else
+#include <socket.h>
+#endif
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
diff --git a/rx/XUrls.c b/rx/XUrls.c
index 28d5540..ec1f7c1 100644
--- a/rx/XUrls.c
+++ b/rx/XUrls.c
@@ -26,8 +26,10 @@ other dealings in this Software without prior written authorization from
 The Open Group.
 
 */
+/* $XFree86: xc/programs/xrx/rx/XUrls.c,v 1.11 2001/12/14 20:02:19 dawes Exp $ */
 
 #include "RxI.h"
+#include "XUrls.h"
 #include <sys/utsname.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -36,9 +38,6 @@ The Open Group.
 #include <stdlib.h>
 #include <limits.h>		/* for MAXHOSTNAMELEN */
 #include <errno.h>
-#ifdef X_NOT_STDC_ENV
-extern int errno;
-#endif
 
 /* and in case we didn't get it from the headers above */
 #ifndef MAXHOSTNAMELEN
@@ -68,11 +67,7 @@ MyBestHostname (
   char* display_name, 
   char* dest_url)
 {
-  struct sockaddr_in local, remote;
-  struct hostent* hp;
   struct utsname host;
-  int s, rv, namelen;
-  char dest_hostname[MAXHOSTNAMELEN + 1];
 
   *myname = '\0';
 
@@ -81,6 +76,11 @@ MyBestHostname (
 
 /* for some reason this doesn't work on Solaris 2.x */
 #if !(defined(sun) && defined(SVR4))
+    struct sockaddr_in local, remote;
+    struct hostent* hp;
+    int s, rv, namelen;
+    char dest_hostname[MAXHOSTNAMELEN + 1];
+
     ParseHostname (dest_url, dest_hostname, sizeof dest_hostname);
 
     hp = gethostbyname (dest_hostname);
@@ -115,7 +115,7 @@ MyBestHostname (
 
 	  if (rv != -1) {
 	    namelen = sizeof local;
-	    rv = getsockname (s, (struct sockaddr*) &local, &namelen);
+	    rv = getsockname (s, (struct sockaddr*) &local, (void *)&namelen);
 
 	    if (rv != -1) {
 	      hp = gethostbyaddr ((char*) &local.sin_addr.s_addr, 
@@ -166,7 +166,7 @@ MyBestHostname (
 char *
 GetXUrl(char *display_name, char *auth, char* dest_url)
 {
-    char *dpy_name, *proto;
+    char *dpy_name, *proto = NULL;
     char *url, *ptr;
     char *name;
     struct hostent *host;
@@ -241,7 +241,7 @@ GetXUrl(char *display_name, char *auth, char* dest_url)
 char *
 GetXPrintUrl(char *display_name, char *printer, char *auth, char* dest_url)
 {
-    char *dpy_name, *proto;
+    char *dpy_name, *proto = NULL;
     char *url, *ptr;
     char *name;
     struct hostent *host;
diff --git a/testplugin/testplugin.man b/testplugin/testplugin.man
index 6c1edc8..9ce11ec 100644
--- a/testplugin/testplugin.man
+++ b/testplugin/testplugin.man
@@ -22,7 +22,10 @@
 .\" not be used in advertising or otherwise to promote the sale, use or
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
-.TH TESTPLUGIN 1 "Release 6.4" "X Version 11"
+.\"
+.\" $XFree86: xc/programs/xrx/testplugin/testplugin.man,v 1.7 2001/12/14 20:02:21 dawes Exp $
+.\"
+.TH TESTPLUGIN 1 __xorgversion__
 .SH NAME
 testplugin - a Netscape Plug-in test bed utility
 .SH SYNOPSIS