From 770a0aab919bc5b582e01fc61df223ce9c6de953 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Thu, 22 Jul 1999 02:58:32 +0000
Subject: [PATCH] update to new format for cpp define SunOS

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6480 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/ftp/ftpd/ftpd_locl.h        | 2 +-
 appl/kx/kx.h                     | 2 +-
 appl/telnet/telnet/telnet_locl.h | 2 +-
 appl/telnet/telnetd/sys_term.c   | 6 +++---
 appl/telnet/telnetd/telnetd.h    | 2 +-
 kuser/kuser_locl.h               | 2 +-
 lib/kafs/kafs_locl.h             | 2 +-
 lib/krb5/krb5_locl.h             | 2 +-
 lib/roken/hstrerror.c            | 4 ++--
 lib/roken/roken.h.in             | 4 ++--
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/appl/ftp/ftpd/ftpd_locl.h b/appl/ftp/ftpd/ftpd_locl.h
index fcdd8b141..bff0dd571 100644
--- a/appl/ftp/ftpd/ftpd_locl.h
+++ b/appl/ftp/ftpd/ftpd_locl.h
@@ -60,7 +60,7 @@
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
-#if defined(HAVE_SYS_IOCTL_H) && SunOS != 4
+#if defined(HAVE_SYS_IOCTL_H) && SunOS != 40
 #include <sys/ioctl.h>
 #endif
 #ifdef TIME_WITH_SYS_TIME
diff --git a/appl/kx/kx.h b/appl/kx/kx.h
index 2a7401be2..3c5961156 100644
--- a/appl/kx/kx.h
+++ b/appl/kx/kx.h
@@ -113,7 +113,7 @@
 #endif
 
 /* as far as we know, this is only used with later versions of Slowlaris */
-#if SunOS == 5 && defined(HAVE_SYS_STROPTS_H) && defined(HAVE_FATTACH) && defined(I_PUSH)
+#if SunOS >= 50 && defined(HAVE_SYS_STROPTS_H) && defined(HAVE_FATTACH) && defined(I_PUSH)
 #define MAY_HAVE_X11_PIPES
 #endif
 
diff --git a/appl/telnet/telnet/telnet_locl.h b/appl/telnet/telnet/telnet_locl.h
index d1ecf45d8..3546d7277 100644
--- a/appl/telnet/telnet/telnet_locl.h
+++ b/appl/telnet/telnet/telnet_locl.h
@@ -108,7 +108,7 @@
 #include <sys/param.h>
 #endif
 /* not with SunOS 4 */
-#if defined(HAVE_SYS_IOCTL_H) && SunOS != 4
+#if defined(HAVE_SYS_IOCTL_H) && SunOS != 40
 #include <sys/ioctl.h>
 #endif
 #ifdef HAVE_SYS_RESOURCE_H
diff --git a/appl/telnet/telnetd/sys_term.c b/appl/telnet/telnetd/sys_term.c
index 6a2669608..6d21a0ac5 100644
--- a/appl/telnet/telnetd/sys_term.c
+++ b/appl/telnet/telnetd/sys_term.c
@@ -395,7 +395,7 @@ int getpty(int *ptynum)
     int p;
     char *cp, *p1, *p2;
     int i;
-#if SunOS == 4
+#if SunOS == 40
     int dummy;
 #endif
 #if 0 /* && defined(HAVE_OPENPTY) */
@@ -464,14 +464,14 @@ int getpty(int *ptynum)
 #endif
 		chown(line, 0, 0);
 		chmod(line, 0600);
-#if SunOS == 4
+#if SunOS == 40
 		if (ioctl(p, TIOCGPGRP, &dummy) == 0
 		    || errno != EIO) {
 		    chmod(line, 0666);
 		    close(p);
 		    line[5] = 'p';
 		} else
-#endif /* SunOS == 4 */
+#endif /* SunOS == 40 */
 		    return(p);
 	    }
 	}
diff --git a/appl/telnet/telnetd/telnetd.h b/appl/telnet/telnetd/telnetd.h
index 09d6b33d0..5ad5bd879 100644
--- a/appl/telnet/telnetd/telnetd.h
+++ b/appl/telnet/telnetd/telnetd.h
@@ -81,7 +81,7 @@
 /* including both <sys/ioctl.h> and <termios.h> in SunOS 4 generates a
    lot of warnings */
 
-#if defined(HAVE_SYS_IOCTL_H) && SunOS != 4
+#if defined(HAVE_SYS_IOCTL_H) && SunOS != 40
 #include <sys/ioctl.h>
 #endif
 #ifdef HAVE_SYS_FILIO_H
diff --git a/kuser/kuser_locl.h b/kuser/kuser_locl.h
index e0eead0ea..062a96daa 100644
--- a/kuser/kuser_locl.h
+++ b/kuser/kuser_locl.h
@@ -83,7 +83,7 @@
 #ifdef KRB4
 #include <krb.h>
 #endif
-#if defined(HAVE_SYS_IOCTL_H) && SunOS != 4
+#if defined(HAVE_SYS_IOCTL_H) && SunOS != 40
 #include <sys/ioctl.h>
 #endif
 #ifdef HAVE_SYS_IOCCOM_H
diff --git a/lib/kafs/kafs_locl.h b/lib/kafs/kafs_locl.h
index e1fe02d0d..b4642b6d5 100644
--- a/lib/kafs/kafs_locl.h
+++ b/lib/kafs/kafs_locl.h
@@ -58,7 +58,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#if defined(HAVE_SYS_IOCTL_H) && SunOS != 4
+#if defined(HAVE_SYS_IOCTL_H) && SunOS != 40
 #include <sys/ioctl.h>
 #endif
 #ifdef HAVE_SYS_FILIO_H
diff --git a/lib/krb5/krb5_locl.h b/lib/krb5/krb5_locl.h
index 8ff5d99df..3df58d678 100644
--- a/lib/krb5/krb5_locl.h
+++ b/lib/krb5/krb5_locl.h
@@ -61,7 +61,7 @@
 #include <fcntl.h>
 #endif
 
-#if defined(HAVE_SYS_IOCTL_H) && SunOS != 4
+#if defined(HAVE_SYS_IOCTL_H) && SunOS != 40
 #include <sys/ioctl.h>
 #endif
 #ifdef HAVE_PWD_H
diff --git a/lib/roken/hstrerror.c b/lib/roken/hstrerror.c
index 3d0ffb47e..4876215a9 100644
--- a/lib/roken/hstrerror.c
+++ b/lib/roken/hstrerror.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
+ * Copyright (c) 1995 - 1999 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  * 
@@ -48,7 +48,7 @@ RCSID("$Id$");
 #include <stdio.h>
 
 #ifdef HAVE_NETDB_H
-#if (defined(SunOS) && (SunOS >= 5))
+#if (defined(SunOS) && (SunOS >= 50))
 #define hstrerror broken_proto
 #endif
 #include <netdb.h>
diff --git a/lib/roken/roken.h.in b/lib/roken/roken.h.in
index 652ff1ab6..ef3588b95 100644
--- a/lib/roken/roken.h.in
+++ b/lib/roken/roken.h.in
@@ -95,7 +95,7 @@
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
 #endif
-#if defined(HAVE_SYS_IOCTL_H) && SunOS != 4
+#if defined(HAVE_SYS_IOCTL_H) && SunOS != 40
 #include <sys/ioctl.h>
 #endif
 #ifdef TIME_WITH_SYS_TIME
@@ -232,7 +232,7 @@ char *strerror(int eno);
 
 #if !defined(HAVE_HSTRERROR) || defined(NEED_HSTRERROR_PROTO)
 /* This causes a fatal error under Psoriasis */
-#if !(defined(SunOS) && (SunOS >= 5))
+#if !(defined(SunOS) && (SunOS >= 50))
 const char *hstrerror(int herr);
 #endif
 #endif