merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGE

12 files changed, 16 insertions, 12 deletions

diff --git a/helper/GetUrl.c b/helper/GetUrl.c
index d116209..d5c31a9 100644
--- a/helper/GetUrl.c
+++ b/helper/GetUrl.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from
 The Open Group.
 
 */
-/* $XFree86: xc/programs/xrx/helper/GetUrl.c,v 1.5 2003/07/20 16:12:20 tsi Exp $ */
+/* $XFree86: xc/programs/xrx/helper/GetUrl.c,v 1.4tsi Exp $ */
 
 /*
  * This file is really split into two major parts where GetUrl is implemented
diff --git a/helper/xrx.man b/helper/xrx.man
index 8eb74b2..f78fce9 100644
--- a/helper/xrx.man
+++ b/helper/xrx.man
@@ -24,7 +24,7 @@
 .\" from The Open Group.
 .\" 
 .\"
-.\" $XFree86: xc/programs/xrx/helper/xrx.man,v 1.7 2001/12/14 20:02:16 dawes Exp $
+.\" $XFree86: xc/programs/xrx/helper/xrx.man,v 1.6 2001/01/27 18:21:22 dawes Exp $
 .\"
 .TH XRX 1 __xorgversion__
 .SH NAME
diff --git a/plugin/Main.c b/plugin/Main.c
index 7aab439..7f11777 100644
--- a/plugin/Main.c
+++ b/plugin/Main.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from
 The Open Group.
 
 */
-/* $XFree86: xc/programs/xrx/plugin/Main.c,v 1.9 2003/05/27 22:27:09 tsi Exp $ */
+/* $XFree86: xc/programs/xrx/plugin/Main.c,v 1.8tsi Exp $ */
 
 /*
  * RX plug-in module based on the UnixTemplate file provided by Netcape.
diff --git a/plugin/PProcess.c b/plugin/PProcess.c
index 788cfdc..2de5b39 100644
--- a/plugin/PProcess.c
+++ b/plugin/PProcess.c
@@ -26,7 +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 $ */
+/* $XFree86: xc/programs/xrx/plugin/PProcess.c,v 1.6tsi Exp $ */
 
 #include "RxPlugin.h"
 #include "XUrls.h"
@@ -114,6 +114,7 @@ IsInWinList(Window *list, int count, Window win)
     return False;
 }
 
+#ifdef UNUSED
 static void
 AppendToWinList(Window **new_list, int *new_count,
 		Window *list, int count, Window win)
@@ -123,6 +124,7 @@ AppendToWinList(Window **new_list, int *new_count,
     memcpy(*new_list, list, sizeof(Window) * count);
     (*new_list)[count] = win;
 }
+#endif
 
 static void
 PrependToWinList(Window **new_list, int *new_count,
@@ -187,6 +189,7 @@ RemoveFromWinList(Window **wlist, int *count, Window win)
         list[0] = list[1];
 }
 
+#ifdef UNUSED
 static void
 ConcatWinLists(Window **list, int *count,
 	       Window *list1, int count1,
@@ -218,6 +221,7 @@ SubstractWinLists(Window **wlist, int *count,
     for (; i < *count; i++, list++)
 	list[0] = list[j];
 }
+#endif
 
 /***********************************************************************
  * Add window to the WM_COLORMAP_WINDOWS property on the Netscape
diff --git a/plugin/include/jri_md.h b/plugin/include/jri_md.h
index a7e5e03..e708b6d 100644
--- a/plugin/include/jri_md.h
+++ b/plugin/include/jri_md.h
@@ -4,7 +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 $ */
+/* $XFree86: xc/programs/xrx/plugin/include/jri_md.h,v 1.2 1999/03/14 03:22:31 dawes Exp $ */
  
 #ifndef JRI_MD_H
 #define JRI_MD_H
diff --git a/plugin/include/npapi.h b/plugin/include/npapi.h
index 888274f..a45b264 100644
--- a/plugin/include/npapi.h
+++ b/plugin/include/npapi.h
@@ -4,7 +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 $ */
+/* $XFree86: xc/programs/xrx/plugin/include/npapi.h,v 1.4 2001/01/17 23:46:25 dawes Exp $ */
 
 #ifndef _NPAPI_H_
 #define _NPAPI_H_
diff --git a/plugin/libxrx.man b/plugin/libxrx.man
index 703e7e9..4e8cf2a 100644
--- a/plugin/libxrx.man
+++ b/plugin/libxrx.man
@@ -24,7 +24,7 @@
 .\" from The Open Group.
 .\" 
 .\"
-.\" $XFree86: xc/programs/xrx/plugin/libxrx.man,v 1.8 2001/12/14 20:02:17 dawes Exp $
+.\" $XFree86: xc/programs/xrx/plugin/libxrx.man,v 1.7 2001/01/27 18:21:22 dawes Exp $
 .\"
 .TH LIBXRX 1 __xorgversion__
 .SH NAME
diff --git a/rx/Prefs.c b/rx/Prefs.c
index 5f3e5c0..55389a4 100644
--- a/rx/Prefs.c
+++ b/rx/Prefs.c
@@ -26,7 +26,7 @@ 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 $ */
+/* $XFree86: xc/programs/xrx/rx/Prefs.c,v 1.5 2001/01/17 23:46:25 dawes Exp $ */
 
 #include "Prefs.h"
 #include <ctype.h>
diff --git a/rx/XDpyName.c b/rx/XDpyName.c
index 106f2e3..93f717d 100644
--- a/rx/XDpyName.c
+++ b/rx/XDpyName.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from
 The Open Group.
 
 */
-/* $XFree86: xc/programs/xrx/rx/XDpyName.c,v 1.7 2003/10/24 20:38:22 tsi Exp $ */
+/* $XFree86: xc/programs/xrx/rx/XDpyName.c,v 1.6tsi Exp $ */
 
 #ifdef XP_UNIX
 #include "RxPlugin.h"		/* for PluginGlobal */
diff --git a/rx/XUrls.c b/rx/XUrls.c
index 105a805..0a60b76 100644
--- a/rx/XUrls.c
+++ b/rx/XUrls.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from
 The Open Group.
 
 */
-/* $XFree86: xc/programs/xrx/rx/XUrls.c,v 1.12 2003/07/20 16:12:20 tsi Exp $ */
+/* $XFree86: xc/programs/xrx/rx/XUrls.c,v 1.11tsi Exp $ */
 
 #include "RxI.h"
 #include "XUrls.h"
diff --git a/testplugin/testplugin.man b/testplugin/testplugin.man
index 9ce11ec..8f431e5 100644
--- a/testplugin/testplugin.man
+++ b/testplugin/testplugin.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xrx/testplugin/testplugin.man,v 1.7 2001/12/14 20:02:21 dawes Exp $
+.\" $XFree86: xc/programs/xrx/testplugin/testplugin.man,v 1.6 2001/01/27 18:21:22 dawes Exp $
 .\"
 .TH TESTPLUGIN 1 __xorgversion__
 .SH NAME
diff --git a/xnest-plugin/XnestDis.c b/xnest-plugin/XnestDis.c
index 36266e4..b93a20f 100644
--- a/xnest-plugin/XnestDis.c
+++ b/xnest-plugin/XnestDis.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from
 The Open Group.
 
 */
-/* $XFree86: xc/programs/xrx/xnest-plugin/XnestDis.c,v 1.3 2003/07/20 16:12:21 tsi Exp $ */
+/* $XFree86$ */
 
 #include "RxPlugin.h"