blob: 04e516c3d1e87da3e2c9d675c7c822e88e6271e5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
$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;
}
|
