oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

update to new format for cpp define SunOS

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6480 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-07-22 02:58:32 +00:00
parent 5fb00398bc
commit 770a0aab91
10 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
appl/ftp/ftpd/ftpd_locl.h
View File

@@ -60,7 +60,7 @@
#ifdef HAVE_SYS_SOCKET_H #ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h> #include <sys/socket.h>
#endif #endif
#if defined(HAVE_SYS_IOCTL_H) && SunOS != 4 #if defined(HAVE_SYS_IOCTL_H) && SunOS != 40
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif #endif
#ifdef TIME_WITH_SYS_TIME #ifdef TIME_WITH_SYS_TIME

2
appl/kx/kx.h
View File

@@ -113,7 +113,7 @@
#endif #endif
/* as far as we know, this is only used with later versions of Slowlaris */ /* 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 #define MAY_HAVE_X11_PIPES
#endif #endif

2
appl/telnet/telnet/telnet_locl.h
View File

@@ -108,7 +108,7 @@
#include <sys/param.h> #include <sys/param.h>
#endif #endif
/* not with SunOS 4 */ /* not with SunOS 4 */
#if defined(HAVE_SYS_IOCTL_H) && SunOS != 4 #if defined(HAVE_SYS_IOCTL_H) && SunOS != 40
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif #endif
#ifdef HAVE_SYS_RESOURCE_H #ifdef HAVE_SYS_RESOURCE_H

6
appl/telnet/telnetd/sys_term.c
View File

@@ -395,7 +395,7 @@ int getpty(int *ptynum)
int p; int p;
char *cp, *p1, *p2; char *cp, *p1, *p2;
int i; int i;
#if SunOS == 4 #if SunOS == 40
int dummy; int dummy;
#endif #endif
#if 0 /* && defined(HAVE_OPENPTY) */ #if 0 /* && defined(HAVE_OPENPTY) */
@@ -464,14 +464,14 @@ int getpty(int *ptynum)
#endif #endif
chown(line, 0, 0); chown(line, 0, 0);
chmod(line, 0600); chmod(line, 0600);
#if SunOS == 4 #if SunOS == 40
if (ioctl(p, TIOCGPGRP, &dummy) == 0 if (ioctl(p, TIOCGPGRP, &dummy) == 0
|| errno != EIO) { || errno != EIO) {
chmod(line, 0666); chmod(line, 0666);
close(p); close(p);
line[5] = 'p'; line[5] = 'p';
} else } else
#endif /* SunOS == 4 */ #endif /* SunOS == 40 */
return(p); return(p);
} }
} }

2
appl/telnet/telnetd/telnetd.h
View File

@@ -81,7 +81,7 @@
/* including both <sys/ioctl.h> and <termios.h> in SunOS 4 generates a /* including both <sys/ioctl.h> and <termios.h> in SunOS 4 generates a
lot of warnings */ lot of warnings */
#if defined(HAVE_SYS_IOCTL_H) && SunOS != 4 #if defined(HAVE_SYS_IOCTL_H) && SunOS != 40
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif #endif
#ifdef HAVE_SYS_FILIO_H #ifdef HAVE_SYS_FILIO_H

2
kuser/kuser_locl.h
View File

@@ -83,7 +83,7 @@
#ifdef KRB4 #ifdef KRB4
#include <krb.h> #include <krb.h>
#endif #endif
#if defined(HAVE_SYS_IOCTL_H) && SunOS != 4 #if defined(HAVE_SYS_IOCTL_H) && SunOS != 40
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif #endif
#ifdef HAVE_SYS_IOCCOM_H #ifdef HAVE_SYS_IOCCOM_H

2
lib/kafs/kafs_locl.h
View File

@@ -58,7 +58,7 @@
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif
#if defined(HAVE_SYS_IOCTL_H) && SunOS != 4 #if defined(HAVE_SYS_IOCTL_H) && SunOS != 40
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif #endif
#ifdef HAVE_SYS_FILIO_H #ifdef HAVE_SYS_FILIO_H

2
lib/krb5/krb5_locl.h
View File

@@ -61,7 +61,7 @@
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#if defined(HAVE_SYS_IOCTL_H) && SunOS != 4 #if defined(HAVE_SYS_IOCTL_H) && SunOS != 40
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif #endif
#ifdef HAVE_PWD_H #ifdef HAVE_PWD_H

4
lib/roken/hstrerror.c
View File

@@ -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). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -48,7 +48,7 @@ RCSID("$Id$");
#include <stdio.h> #include <stdio.h>
#ifdef HAVE_NETDB_H #ifdef HAVE_NETDB_H
#if (defined(SunOS) && (SunOS >= 5)) #if (defined(SunOS) && (SunOS >= 50))
#define hstrerror broken_proto #define hstrerror broken_proto
#endif #endif
#include <netdb.h> #include <netdb.h>

4
lib/roken/roken.h.in
View File

@@ -95,7 +95,7 @@
#ifdef HAVE_TERMIOS_H #ifdef HAVE_TERMIOS_H
#include <termios.h> #include <termios.h>
#endif #endif
#if defined(HAVE_SYS_IOCTL_H) && SunOS != 4 #if defined(HAVE_SYS_IOCTL_H) && SunOS != 40
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif #endif
#ifdef TIME_WITH_SYS_TIME #ifdef TIME_WITH_SYS_TIME
@@ -232,7 +232,7 @@ char *strerror(int eno);
#if !defined(HAVE_HSTRERROR) || defined(NEED_HSTRERROR_PROTO) #if !defined(HAVE_HSTRERROR) || defined(NEED_HSTRERROR_PROTO)
/* This causes a fatal error under Psoriasis */ /* This causes a fatal error under Psoriasis */
#if !(defined(SunOS) && (SunOS >= 5)) #if !(defined(SunOS) && (SunOS >= 50))
const char *hstrerror(int herr); const char *hstrerror(int herr);
#endif #endif
#endif #endif