olwm:

Don't make the inclusion of sys/param.h a conditional of OW_I18N_L4.
Always include it, otherwise the BSD symbol is not defined and a
gethostname with three instead of two arguments is included.

1 files changed, 37 insertions, 17 deletions

diff --git a/x11-toolkits/xview-clients/files/patch-aa b/x11-toolkits/xview-clients/files/patch-aa
index a36c91ad5f88..c20eda560eaa 100644
--- a/x11-toolkits/xview-clients/files/patch-aa
+++ b/x11-toolkits/xview-clients/files/patch-aa
@@ -58,23 +58,6 @@ diff -rc ../old/xview3.2p1-X11R6/clients/olwm/cmdstream.c olwm/cmdstream.c
   
   /* ----------------------------------------------------------------------
    *      SetCmdStream
-diff -rc ../old/xview3.2p1-X11R6/clients/olwm/defaults.c olwm/defaults.c
-*** ../old/xview3.2p1-X11R6/clients/olwm/defaults.c	Tue Jun 29 01:11:43 1993
---- olwm/defaults.c	Sun Nov 20 13:38:56 1994
-***************
-*** 80,86 ****
---- 80,90 ----
-  	if (homedir != NULL) {
-  	    (void) strcpy(filename, homedir);
-  	    (void) strcat(filename, "/.Xdefaults-");
-+ #if (defined(BSD) && (BSD >= 199103))
-+ 	    if (0 == gethostname(hostname, sizeof(hostname))) {
-+ #else
-  	    if (0 == gethostname(hostname, sizeof(hostname), &namelen)) {
-+ #endif
-  		(void) strcat(filename, hostname);
-  		fileDB = XrmGetFileDatabase(filename);
-  	    }
 diff -rc ../old/xview3.2p1-X11R6/clients/olwm/gettext.h olwm/gettext.h
 *** ../old/xview3.2p1-X11R6/clients/olwm/gettext.h	Tue Jun 29 01:11:46 1993
 --- olwm/gettext.h	Sun Nov 20 13:38:57 1994
@@ -353,3 +336,40 @@ diff -rc ../old/xview3.2p1-X11R6/clients/olwmslave/mem.c olwmslave/mem.c
   #include <memory.h>
   #include <stdio.h>
   #include <sys/types.h>
+*** olwm/defaults.c.orig	Tue Jun 29 07:11:43 1993
+--- olwm/defaults.c	Mon Feb 27 00:59:03 1995
+***************
+*** 25,33 ****
+  #include <X11/Xutil.h>
+  #include <X11/Xatom.h>
+  #include <X11/Xresource.h>
+! #ifdef OW_I18N_L4
+  #include <sys/param.h>
+! #endif
+  
+  #include "i18n.h"
+  #include "ollocale.h"
+--- 25,33 ----
+  #include <X11/Xutil.h>
+  #include <X11/Xatom.h>
+  #include <X11/Xresource.h>
+! /* #ifdef OW_I18N_L4 */
+  #include <sys/param.h>
+! /* #endif */
+  
+  #include "i18n.h"
+  #include "ollocale.h"
+***************
+*** 80,86 ****
+--- 80,90 ----
+  	if (homedir != NULL) {
+  	    (void) strcpy(filename, homedir);
+  	    (void) strcat(filename, "/.Xdefaults-");
++ #if (defined(BSD) && (BSD >= 199103))
++ 	    if (0 == gethostname(hostname, sizeof(hostname))) {
++ #else
+  	    if (0 == gethostname(hostname, sizeof(hostname), &namelen)) {
++ #endif
+  		(void) strcat(filename, hostname);
+  		fileDB = XrmGetFileDatabase(filename);
+  	    }