old version screen-3.9.4 Aug 5 1999

1 files changed, 44 insertions, 18 deletions

diff --git a/src/os.h b/src/os.h
index 446f0b6..9e65c99 100644
--- a/src/os.h
+++ b/src/os.h
@@ -24,17 +24,22 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include <sys/param.h>
 
+#ifdef __hpux
+/* workaround for HPUX-11 which manages to include sys/user.h! */
+# define _SYS_USER_INCLUDED
+#endif
+
+#include <sys/param.h>
 
 /* In strict ANSI mode, HP-UX machines define __hpux but not hpux */
 #if defined(__hpux) && !defined(hpux)
 # define hpux
 #endif
 
-#if defined(BSDI) || defined(__386BSD__) || defined(_CX_UX) || defined(hpux) || defined(_IBMR2)
+#if defined(__bsdi__) || defined(__386BSD__) || defined(_CX_UX) || defined(hpux) || defined(_IBMR2)
 # include <signal.h>
-#endif /* BSDI || __386BSD__ || _CX_UX || hpux || _IBMR2 */
+#endif /* __bsdi__ || __386BSD__ || _CX_UX || hpux || _IBMR2 */
 
 #ifdef ISC
 # ifdef ENAMETOOLONG
@@ -83,9 +88,9 @@ extern int errno;
 #  define strlen ___strlen___
 #  include <string.h>
 #  undef strlen
-#  ifndef NEWSOS
+#  if !defined(NEWSOS) && !defined(__hpux)
     extern size_t strlen(const char *);
-#  endif /* NEWSOS */
+#  endif
 # else /* SVR4 */
 #  include <string.h>
 # endif /* SVR4 */
@@ -94,9 +99,30 @@ extern int errno;
 #ifdef USEVARARGS
 # if defined(__STDC__)
 #  include <stdarg.h>
+#  define VA_LIST(var) va_list var;
+#  define VA_DOTS ...
+#  define VA_DECL
+#  define VA_START(ap, fmt) va_start(ap, fmt)
+#  define VA_ARGS(ap) ap
+#  define VA_END(ap) va_end(ap)
 # else
 #  include <varargs.h>
+#  define VA_LIST(var) va_list var;
+#  define VA_DOTS va_alist
+#  define VA_DECL va_dcl
+#  define VA_START(ap, fmt) va_start(ap)
+#  define VA_ARGS(ap) ap
+#  define VA_END(ap) va_end(ap)
 # endif
+#else
+# define VA_LIST(var)
+# define VA_DOTS p1, p2, p3, p4, p5, p6
+# define VA_DECL unsigned long VA_DOTS;
+# define VA_START(ap, fmt)
+# define VA_ARGS(ap) VA_DOTS
+# define VA_END(ap)
+# undef vsnprintf
+# define vsnprintf xsnprintf
 #endif
 
 #if !defined(sun) && !defined(B43) && !defined(ISC) && !defined(pyr) && !defined(_CX_UX)
@@ -104,7 +130,7 @@ extern int errno;
 #endif
 #include <sys/time.h>
 
-#ifdef M_UNIX	/* SCO */
+#ifdef M_UNIX   /* SCO */
 # include <sys/stream.h>
 # include <sys/ptem.h>
 # define ftruncate(fd, s) chsize(fd, s)
@@ -116,10 +142,10 @@ extern int errno;
 # define bzero(poi,len) memset(poi,0,len)
 # define bcmp memcmp
 # define killpg(pgrp,sig) kill( -(pgrp), sig)
-#else
-# ifndef linux
-#   define getcwd(b,l) getwd(b)
-# endif
+#endif
+
+#ifndef HAVE_GETCWD
+# define getcwd(b,l) getwd(b)
 #endif
 
 #ifndef USEBCOPY
@@ -145,7 +171,7 @@ extern int errno;
 #endif
 
 #if !defined(HAVE__EXIT) && !defined(_exit)
-# define _exit(x) exit(x)
+#define _exit(x) exit(x)
 #endif
 
 #ifndef HAVE_UTIMES
@@ -155,6 +181,10 @@ extern int errno;
 # define vsnprintf xvsnprintf
 #endif
 
+#ifdef BUILTIN_TELNET
+# include <netinet/in.h>
+#endif
+
 /*****************************************************************
  *    terminal handling
  */
@@ -210,7 +240,7 @@ extern int errno;
 #endif
 
 /* linux ncurses is broken, we have to use our own tputs */
-#ifdef linux
+#if defined(linux) && defined(TERMINFO)
 # define tputs xtputs
 #endif
 
@@ -226,7 +256,7 @@ extern int errno;
 #endif
 
 #if defined(UTMPOK) || defined(BUGGYGETLOGIN)
-# if defined(SVR4) && !defined(DGUX)
+# if defined(SVR4) && !defined(DGUX) && !defined(__hpux)
 #  include <utmpx.h>
 #  define UTMPFILE	UTMPX_FILE
 #  define utmp		utmpx
@@ -249,10 +279,6 @@ extern int errno;
     */
 #  define UTNOKEEP
 # endif /* apollo */
-# ifdef linux
-   /* pututline is useless so we do it ourself...  */
-#  define UT_UNSORTED
-# endif
 
 # ifndef UTMPFILE
 #  ifdef UTMP_FILE
@@ -381,7 +407,7 @@ extern int errno;
 #endif
 
 /* Geeeee, reverse it? */
-#if defined(SVR4) || (defined(SYSV) && defined(ISC)) || defined(_AIX) || defined(linux) || defined(ultrix) || defined(__386BSD__) || defined(BSDI) || defined(POSIX) || defined(NeXT)
+#if defined(SVR4) || (defined(SYSV) && defined(ISC)) || defined(_AIX) || defined(linux) || defined(ultrix) || defined(__386BSD__) || defined(__bsdi__) || defined(POSIX) || defined(NeXT)
 # define SIGHASARG
 #endif