[src/trunk]: src/lib/libedit use __sun || sun instead of _SunOS, from Jess Th...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5bc51b8e5f40
branches:  trunk
changeset: 747050:5bc51b8e5f40
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Aug 30 15:41:05 2009 +0000

description:
use __sun || sun instead of _SunOS, from Jess Thrysoee

diffstat:

 lib/libedit/readline/readline.h |  4 ++--
 lib/libedit/sys.h               |  4 ++--
 lib/libedit/term.c              |  7 ++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diffs (64 lines):

diff -r f89ce30a7465 -r 5bc51b8e5f40 lib/libedit/readline/readline.h
--- a/lib/libedit/readline/readline.h   Sun Aug 30 14:57:51 2009 +0000
+++ b/lib/libedit/readline/readline.h   Sun Aug 30 15:41:05 2009 +0000
@@ -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
diff -r f89ce30a7465 -r 5bc51b8e5f40 lib/libedit/sys.h
--- a/lib/libedit/sys.h Sun Aug 30 14:57:51 2009 +0000
+++ b/lib/libedit/sys.h Sun Aug 30 15:41:05 2009 +0000
@@ -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 *);
diff -r f89ce30a7465 -r 5bc51b8e5f40 lib/libedit/term.c
--- a/lib/libedit/term.c        Sun Aug 30 14:57:51 2009 +0000
+++ b/lib/libedit/term.c        Sun Aug 30 15:41:05 2009 +0000
@@ -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>