summaryrefslogtreecommitdiff
path: root/x11/xview-lib/patches/patch-cy
blob: 03aee734e9be83f3484e6540cf8c03aa1f4aa54f (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
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
$NetBSD: patch-cy,v 1.1 2001/12/20 09:20:05 tron Exp $

--- lib/libxview/textsw/txt_file.c.orig	Tue Jun 29 07:17:48 1993
+++ lib/libxview/textsw/txt_file.c	Thu Dec 20 10:09:41 2001
@@ -45,13 +45,26 @@
 
 extern CHAR    *STRCAT();
 extern CHAR    *STRNCAT();
-#ifdef SVR4
+
+#if (defined(SVR4) || (__NetBSD_Version__ >= 103080000))
+#define GETCWD
+#endif
+
+#ifdef GETCWD
 extern char    *getcwd();
 #else
 extern char    *getwd();
-#endif /* SVR4 */
+#endif /* GETCWD */
 extern int      errno, sys_nerr;
+#if (defined(BSD) && (BSD >= 199306))
+#if __NetBSD_Version__ > 103080000
+#include <errno.h>
+#else
+extern const char *const sys_errlist[];
+#endif
+#else
 extern char    *sys_errlist[];
+#endif
 
 Pkg_private int textsw_change_directory();
 Pkg_private void textsw_display(), textsw_display_view_margins();
@@ -354,21 +367,21 @@
     }
 
 #ifdef		OW_I18N
-#ifdef SVR4
+#ifdef GETCWD
     if (getcwd(pathname_mb, MAXPATHLEN) == 0)
 #else
     if (getwd(pathname_mb) == 0)
-#endif /* SVR4 */
+#endif /* GETCWD */
 	return (0);
     (void) mbstowcs(pathname, pathname_mb, MAXPATHLEN-1);
 
 #else		/* OW_I18N */
 
-#ifdef SVR4
+#ifdef GETCWD
     if (getcwd(pathname, MAXPATHLEN) == 0)
 #else
     if (getwd(pathname) == 0)
-#endif /* SVR4 */
+#endif /* GETCWD */
 	return (0);
 #endif		/* OW_I18N */