Module Name: src
Committed By: christos
Date: Sun Aug 30 15:41:05 UTC 2009
Modified Files:
src/lib/libedit: sys.h term.c
src/lib/libedit/readline: readline.h
Log Message:
use __sun || sun instead of _SunOS, from Jess Thrysoee
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libedit/sys.h
cvs rdiff -u -r1.53 -r1.54 src/lib/libedit/term.c
cvs rdiff -u -r1.27 -r1.28 src/lib/libedit/readline/readline.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/sys.h
diff -u src/lib/libedit/sys.h:1.10 src/lib/libedit/sys.h:1.11
--- src/lib/libedit/sys.h:1.10 Fri Feb 6 15:08:13 2009
+++ src/lib/libedit/sys.h Sun Aug 30 11:41:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sys.h,v 1.10 2009/02/06 20:08:13 sketch Exp $ */
+/* $NetBSD: sys.h,v 1.11 2009/08/30 15:41:05 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -101,7 +101,7 @@
#define REGEX /* Use POSIX.2 regular expression functions */
#undef REGEXP /* Use UNIX V8 regular expression functions */
-#ifdef __SunOS
+#if defined(sun) || defined(__sun)
extern int tgetent(char *, const char *);
extern int tgetflag(char *);
extern int tgetnum(char *);
Index: src/lib/libedit/term.c
diff -u src/lib/libedit/term.c:1.53 src/lib/libedit/term.c:1.54
--- src/lib/libedit/term.c:1.53 Fri Jul 17 08:27:57 2009
+++ src/lib/libedit/term.c Sun Aug 30 11:41:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: term.c,v 1.53 2009/07/17 12:27:57 christos Exp $ */
+/* $NetBSD: term.c,v 1.54 2009/08/30 15:41:05 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)term.c 8.2 (Berkeley) 4/30/95";
#else
-__RCSID("$NetBSD: term.c,v 1.53 2009/07/17 12:27:57 christos Exp $");
+__RCSID("$NetBSD: term.c,v 1.54 2009/08/30 15:41:05 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -60,7 +60,8 @@
#include <ncurses.h>
#endif
/* Solaris's term.h does horrid things. */
-#if (defined(HAVE_TERM_H) && !defined(__SunOS))
+
+#if defined(HAVE_TERM_H) && !defined(sun) && !defined(__sun)
#include <term.h>
#endif
#include <sys/types.h>
Index: src/lib/libedit/readline/readline.h
diff -u src/lib/libedit/readline/readline.h:1.27 src/lib/libedit/readline/readline.h:1.28
--- src/lib/libedit/readline/readline.h:1.27 Thu Jul 9 15:02:04 2009
+++ src/lib/libedit/readline/readline.h Sun Aug 30 11:41:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: readline.h,v 1.27 2009/07/09 19:02:04 christos Exp $ */
+/* $NetBSD: readline.h,v 1.28 2009/08/30 15:41:05 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#ifndef CTRL
#include <sys/ioctl.h>
-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX)
+#if !defined(sun) && !defined(__sun) && !defined(__hpux) && !defined(_AIX)
#include <sys/ttydefaults.h>
#endif
#ifndef CTRL
