From 2e83e1e11e88f75a2bef73174064c12e5344b919 Mon Sep 17 00:00:00 2001 From: Dave Love Date: Fri, 23 Jun 2000 17:02:15 +0000 Subject: [PATCH] Move string.h hack here from alpha.h and make it conditional. (C_SWITCH_SYSTEM): Use _OSF_SOURCE, not -BSD, which clashes with _XOPEN_SOURCE. (WAIT_USE_INT, SYS_SIGLIST_DECLARED, sys_siglist, NSIG): Define. (SOCKLEN_TYPE): Don't define. --- src/s/osf1.h | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/src/s/osf1.h b/src/s/osf1.h index 2103a8c50e7..dd4fc372a64 100644 --- a/src/s/osf1.h +++ b/src/s/osf1.h @@ -4,12 +4,23 @@ #define OSF1 -/* Define _BSD to tell the include files we're running under - the BSD universe and not the SYSV universe. */ - +/* The following used to be done, but -BSD loses when _XOPEN_SOURCE + gets defined by configure, at least on OSF5. It's possible this + will need to be reverted for earlier versions (for which OSF5 isn't + defined). */ +#if 0 #define C_SWITCH_SYSTEM -D_BSD #define LIBS_SYSTEM -lbsd +#else + +#define C_SWITCH_SYSTEM -D_OSF_SOURCE +#define WAIT_USE_INT +#define SYS_SIGLIST_DECLARED +#define sys_siglist __sys_siglist +#define NSIG __sys_nsig +#endif /* 0 */ + #define GETPGRP_NO_ARG #define SYSV_SYSTEM_DIR @@ -26,10 +37,22 @@ #define HAVE_TERMIOS -/* Specify the type that the 3rd arg of `accept' points to. */ -#define SOCKLEN_TYPE int - #ifndef __GNUC__ /* Optimize, inaccurate debugging. */ #define C_DEBUG_SWITCH -g3 #endif + +#ifndef OSF5 /* fixed in 5.0 */ +/* Hack alert! For reasons unknown to mankind the string.h file insists + on defining bcopy etc. as taking char pointers as arguments. With + Emacs this produces an endless amount of warning which are harmless, + but tends to flood the real errors. This hack works around this problem + by not prototyping. */ +#define bcopy string_h_bcopy +#define bzero string_h_bzero +#define bcmp string_h_bcmp +#include +#undef bcopy +#undef bzero +#undef bcmp +#endif -- 2.39.2