Fix build on 64bit platforms

4 files changed, 56 insertions, 12 deletions

diff --git a/x11-toolkits/xview/files/patch-clients+olwm+screen.c b/x11-toolkits/xview/files/patch-clients+olwm+screen.c
index 3dd72d5c5f6a..5ee381e1c5cb 100644
--- a/x11-toolkits/xview/files/patch-clients+olwm+screen.c
+++ b/x11-toolkits/xview/files/patch-clients+olwm+screen.c
@@ -1,6 +1,15 @@
---- clients/olwm/screen.c.orig	Tue Jun 29 00:11:56 1993
-+++ clients/olwm/screen.c	Sat Jun 30 19:34:43 2007
-@@ -111,6 +111,12 @@
+--- clients/olwm/screen.c.orig	1993-06-29 07:11:56.000000000 +0200
++++ clients/olwm/screen.c	2007-08-03 14:58:43.000000000 +0200
+@@ -39,6 +39,8 @@
+ #include "iconimage.h"
+ #include "iconmask.h"
+ 
++static updateScreenBackgroundColor(Display *dpy, ScreenInfo *scrInfo);
++
+ /*-------------------------------------------------------------------------
+  *	Default Constants
+  *-------------------------------------------------------------------------*/
+@@ -111,6 +113,12 @@
  static XrmQuark stippledRubberBandsCQ;
  static XrmQuark stippledRubberBandsIQ;
  
@@ -13,7 +22,7 @@
  
  /*-------------------------------------------------------------------------
   *	Local Functions
-@@ -214,6 +220,7 @@
+@@ -214,6 +222,7 @@
  		     	case PseudoColor:
  			case GrayScale:
  		     	case DirectColor:
diff --git a/x11-toolkits/xview/files/patch-clients+olwm+slave.c b/x11-toolkits/xview/files/patch-clients+olwm+slave.c
index 8952411795f4..6f3a5fde879a 100644
--- a/x11-toolkits/xview/files/patch-clients+olwm+slave.c
+++ b/x11-toolkits/xview/files/patch-clients+olwm+slave.c
@@ -1,5 +1,5 @@
---- ./clients/olwm/slave.c.orig	Tue Jun 29 07:11:57 1993
-+++ ./clients/olwm/slave.c	Sat Apr  1 18:26:06 2000
+--- clients/olwm/slave.c.orig	1993-06-29 07:11:57.000000000 +0200
++++ clients/olwm/slave.c	2007-08-03 15:01:51.000000000 +0200
 @@ -22,6 +22,8 @@
  #include <signal.h>
  #include <stdio.h>
@@ -9,3 +9,12 @@
  #include "cmdstream.h"
  #include "error.h"
  
+@@ -44,7 +46,7 @@
+  *	Local Forward Declarations
+  * ---------------------------------------------------------------------*/
+ 
+-void	SlaveFailure();
++static void	SlaveFailure();
+ 
+ 
+ /* ----------------------------------------------------------------------
diff --git a/x11-toolkits/xview/files/patch-clients+olwm+winframe.c b/x11-toolkits/xview/files/patch-clients+olwm+winframe.c
new file mode 100644
index 000000000000..b0c11f7503b8
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-clients+olwm+winframe.c
@@ -0,0 +1,10 @@
+--- clients/olwm/winframe.c.orig	2007-08-03 15:14:08.000000000 +0200
++++ clients/olwm/winframe.c	2007-08-03 15:15:06.000000000 +0200
+@@ -29,6 +29,7 @@
+ #include "globals.h"
+ #include "error.h"
+ 
++static int headerHeight(Client *cli, Graphics_info *gis);
+ 
+ /***************************************************************************
+ * global data
diff --git a/x11-toolkits/xview/files/patch-clients+olwmslave+helpwin.c b/x11-toolkits/xview/files/patch-clients+olwmslave+helpwin.c
index 777b6387ffee..7bc1ce80c6e7 100644
--- a/x11-toolkits/xview/files/patch-clients+olwmslave+helpwin.c
+++ b/x11-toolkits/xview/files/patch-clients+olwmslave+helpwin.c
@@ -1,9 +1,25 @@
---- clients/olwmslave/helpwin.c.orig	Fri Oct 17 18:23:54 2003
-+++ clients/olwmslave/helpwin.c	Fri Oct 17 19:01:59 2003
-@@ -136,6 +136,7 @@
- Bool		ImageHelpWindow();
- void		MoreHelp();
- void		ErrorNotice();
+--- clients/olwmslave/helpwin.c.orig	1993-06-29 07:12:11.000000000 +0200
++++ clients/olwmslave/helpwin.c	2007-08-03 15:23:23.000000000 +0200
+@@ -128,14 +128,15 @@
+  *	Local Forward Functions
+  * ---------------------------------------------------------------------*/
+ int		ShowHelpWindow();
+-void		InitHelpWindow();
+-Bool		CreateHelpWindow();
+-Notify_value	DestroyHelpWindow();
+-void		ResetHelpWindow();
+-Bool		TextHelpWindow();
+-Bool		ImageHelpWindow();
+-void		MoreHelp();
+-void		ErrorNotice();
++static void		InitHelpWindow();
++static Bool		CreateHelpWindow();
++static Notify_value	DestroyHelpWindow();
++static void		ResetHelpWindow();
++static Bool		TextHelpWindow();
++static Bool		ImageHelpWindow();
++static void		MoreHelp();
++static void		ErrorNotice();
 +static int	ConstrainMousePos();
  
  /* ----------------------------------------------------------------------