remove OSF1 support

[oweals/cde.git] / cde / lib / DtSvc / include / bms / sbport.h

diff --git a/cde/lib/DtSvc/include/bms/sbport.h b/cde/lib/DtSvc/include/bms/sbport.h
index 05d9a7329424fb9a47fbe9e3fba3e8f249aace08..edac3ecdf06cd9086dbbf325cdd0845dfad93570 100644 (file)
--- a/cde/lib/DtSvc/include/bms/sbport.h
+++ b/cde/lib/DtSvc/include/bms/sbport.h
@@ -110,22 +110,6 @@
 #   define OSF_BUG
 #endif
 
-#if defined(__osf__) && !defined(__osf)
-#   define __osf
-#   define __sysv
-#   define OSF_BUG
-#   define __char_ptr_yytext
-#endif
-
-#if defined(osf) && !defined(__osf)
-#   define __osf
-#   define __sysv
-#   define __osfs700
-#   define OSF_BUG
-#   define __hp_color_object
-#   define __char_ptr_yytext
-#endif
-
 #ifdef __hpux 
 #   define __sysv
 /* __hp9000s300 or __hp9000s800 is defined by HP-UX cpp */
@@ -223,10 +207,6 @@
 /* ----------------------------------------------------------------- */
 
 #if defined(__need_timeval)            /* Get "struct timeval" */
-#   ifdef __osf
-#      define _OSF_SOURCE
-#      include <sys/time.h>
-#   endif
 #   ifdef __sun
 #      include <sys/time.h>
 #   endif
@@ -240,10 +220,6 @@
 
 
 #if defined(__need_fd_set)             /* Get "typedef struct fd_set" */
-#   ifdef __osf
-#      define _OSF_SOURCE
-#      include <sys/types.h>
-#   endif
 #   ifdef __apollo
 #       define _INCLUDE_BSD_SOURCE
 #       include "/bsd4.3/usr/include/sys/types.h"
@@ -255,9 +231,6 @@
 
 
 #if defined(__need_S_IF)               /* Get S_IFNWK, S_IFLNK */
-#   ifdef __osf
-#      define _OSF_SOURCE
-#   endif
 #   ifdef __apollo
 #      define _APOLLO_SOURCE
 #   endif
@@ -271,9 +244,6 @@
 #endif
 
 #if defined(__need_all_signals)                /* Get all SIGxxx values */
-#   ifdef __osf
-#      define _OSF_SOURCE
-#   endif
 #   ifdef __apollo
 #      define _APOLLO_SOURCE
 #      include "/bsd4.3/usr/include/sys/types.h"
@@ -285,7 +255,7 @@
 /* about above.  So, declare them only if we don't already have them */
 /* ----------------------------------------------------------------- */
 
-#if defined(_HPUX_SOURCE) || defined(__sun) || defined(_INCLUDE_BSD_SOURCE) || defined(_OSF_SOURCE) || defined(__aix) || defined(__osf__) || defined(linux)
+#if defined(_HPUX_SOURCE) || defined(__sun) || defined(_INCLUDE_BSD_SOURCE) || defined(__aix) || defined(linux)
        /* the "u_types" are defined in standard files */
 #      undef _INCLUDE_BSD_SOURCE
 #else
@@ -298,15 +268,11 @@
 /* Use these if you must ensure that  you get a specific number of bits */
 /* -------------------------------------------------------------------- */
 typedef char  int8;
-typedef short int16;                   
-#ifndef __osf__
+typedef short int16;
 typedef long  int32;
-#endif
 typedef unsigned char  u_int8;
 typedef unsigned short u_int16;
-#ifndef __osf__
 typedef unsigned long  u_int32;
-#endif
 
 #define __xechar_is_signed
 #undef  __xechar_is_unsigned