Use X11BASE instead of /usr/X11R6, always include limits.h, it provides

PATH_MAX and exists on all platforms.
This commit is contained in:
joerg 2006-01-04 23:18:08 +00:00
parent 7b9329ece5
commit b36634437f
4 changed files with 21 additions and 16 deletions

View file

@ -1,9 +1,9 @@
$NetBSD: distinfo,v 1.5 2005/02/23 23:12:05 agc Exp $
$NetBSD: distinfo,v 1.6 2006/01/04 23:18:08 joerg Exp $
SHA1 (xtux-arena-src-nov-15.tar.gz) = f8141f0d0c190adfd79b23137ffd632688b539bd
RMD160 (xtux-arena-src-nov-15.tar.gz) = 5b33530ef6ebd2f8c36819ded6aff947da2817bb
Size (xtux-arena-src-nov-15.tar.gz) = 1278142 bytes
SHA1 (patch-aa) = 797c86e26852d8280598e0e8a7e19af7842977ee
SHA1 (patch-ab) = a2cd15c9bc6f51ddadf22cc7a205f7763b83bc0b
SHA1 (patch-ac) = aada5a97d3304b99c5ab3905e4e7c5003e642be0
SHA1 (patch-ad) = ca59e7827e87d8e7f01384906ae9ff9f52d02b5e
SHA1 (patch-ab) = 176f16f7b2827e536232af48621d6acc0bb86368
SHA1 (patch-ac) = 858a4f470eeeba3166fec4b2edb67fc13f67d8d6
SHA1 (patch-ad) = 264aa15cb12a3566455d3253daba7321d170e5d5

View file

@ -1,11 +1,9 @@
$NetBSD: patch-ab,v 1.1.1.1 2000/11/17 06:45:11 hubertf Exp $
$NetBSD: patch-ab,v 1.2 2006/01/04 23:18:08 joerg Exp $
--- src/client/image.c.orig Thu Nov 16 07:38:38 2000
+++ src/client/image.c
@@ -1,3 +1,6 @@
+#ifdef __NetBSD__
+#include <sys/syslimits.h> /* PATH_MAX */
+#endif
@@ -1,3 +1,4 @@
+#include <limits.h> /* PATH_MAX */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

View file

@ -1,11 +1,9 @@
$NetBSD: patch-ac,v 1.1.1.1 2000/11/17 06:45:11 hubertf Exp $
$NetBSD: patch-ac,v 1.2 2006/01/04 23:18:08 joerg Exp $
--- src/client/misc.c.orig Thu Nov 16 07:39:51 2000
+++ src/client/misc.c
@@ -1,3 +1,6 @@
+#ifdef __NetBSD__
+#include <sys/syslimits.h> /* PATH_MAX */
+#endif
@@ -1,3 +1,4 @@
+#include <limits.h> /* PATH_MAX */
#include <X11/Xlib.h>
#include <stdio.h>
#include <stdlib.h>

View file

@ -1,8 +1,17 @@
$NetBSD: patch-ad,v 1.2 2001/12/19 10:04:06 tron Exp $
$NetBSD: patch-ad,v 1.3 2006/01/04 23:18:08 joerg Exp $
--- src/client/Makefile.orig Wed Aug 30 08:59:29 2000
+++ src/client/Makefile Wed Dec 19 11:00:51 2001
@@ -16,14 +16,14 @@
@@ -4,7 +4,7 @@
#======================================================#
# PATHS
-X11_PATH = /usr/X11R6
+X11_PATH = ${X11BASE}
TOPLEVEL_PATH = ../..
COMMON_PATH = $(TOPLEVEL_PATH)/src/common
@@ -16,14 +16,14 @@ CC = gcc
BINARY = $(TOPLEVEL_PATH)/xtux
# Flags used when compiling