34 lines
850 B
Plaintext
34 lines
850 B
Plaintext
$NetBSD: patch-ab,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
|
|
|
|
--- defaults.c.orig Thu Mar 2 22:44:29 2000
|
|
+++ defaults.c Tue Jun 6 19:33:36 2000
|
|
@@ -30,9 +30,7 @@
|
|
#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"
|
|
@@ -89,6 +87,9 @@
|
|
(void) strcat(filename, "/.Xdefaults-");
|
|
#ifdef SVR4
|
|
if (sysinfo(SI_HOSTNAME, hostname, sizeof(hostname)) != -1) {
|
|
+#endif
|
|
+#ifdef BSD
|
|
+ if (0 == gethostname(hostname, sizeof(hostname))) {
|
|
#else
|
|
if (0 == gethostname(hostname, sizeof(hostname), &namelen)) {
|
|
#endif
|
|
@@ -159,7 +160,7 @@
|
|
return appDB;
|
|
}
|
|
|
|
- appDB = XrmGetFileDatabase("/usr/lib/X11/app-defaults/Olwm");
|
|
+ appDB = XrmGetFileDatabase(PREFIX "/lib/X11/app-defaults/Olwm");
|
|
return appDB;
|
|
}
|
|
|