added in some checks to ensure that __GNO__ is defined when necessary

This commit is contained in:
gdr 1997-02-28 04:56:45 +00:00
parent 2a62148c84
commit 5f69f98c1a
6 changed files with 10 additions and 41 deletions

View File

@ -1,34 +0,0 @@
/*************************************************
* Start of GNO v2.0.6 definitions.
*
* $Id: defaults.h,v 1.1 1997/02/28 04:42:01 gdr Exp $
*/
#define __appleiigs__
#define __GNO__
/*
* __ORCAC_VERSION should be:
* undefined for Orca/C earlier than v2.1.0
* 210 for Orca/C v2.1.0 - v2.1.1b1
* 211 for Orca/C v2.1.1b2 and higher
* Note that if you have Orca/C v2.0.x or earlier, it doesn't even
* include this file by default.
*/
#define __ORCAC_VERSION 211
/*
* These should be identically equal. Orca/C headers use one, BSD headers
* use the other. Unfortunately, this construct will miss definitions
* given in source files -- it is only caught on the occ command line.
*/
#if defined(__KeepNamespacePure__) && !defined(_ANSI_SOURCE)
#define _ANSI_SOURCE
#endif
#if defined(_ANSI_SOURCE) && !defined(__KeepNamespacePure__)
#define __KeepNamespacePure__
#endif
/*
* End of GNO v2.0.6 definitions.
*************************************************/

View File

@ -72,7 +72,6 @@ typedef struct __file {
#if defined(__ORCAC_VERSION) && (__ORCAC_VERSION > 210) #if defined(__ORCAC_VERSION) && (__ORCAC_VERSION > 210)
int _pbk[2]; /* put back character; changed in v2.1.1b2 */ int _pbk[2]; /* put back character; changed in v2.1.1b2 */
#else #else
#error bad stuff batman
int _pbk; /* put back character */ int _pbk; /* put back character */
#endif #endif
unsigned int _flag, /* buffer flags */ unsigned int _flag, /* buffer flags */

View File

@ -36,7 +36,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)fcntl.h 8.3 (Berkeley) 1/21/94 * @(#)fcntl.h 8.3 (Berkeley) 1/21/94
* $Id: fcntl.h,v 1.1 1997/02/28 04:42:14 gdr Exp $ * $Id: fcntl.h,v 1.2 1997/02/28 04:56:45 gdr Exp $
*/ */
#ifndef _SYS_FCNTL_H_ #ifndef _SYS_FCNTL_H_
@ -80,7 +80,7 @@
#define O_NONBLOCK 0x0008 /* no delay */ #define O_NONBLOCK 0x0008 /* no delay */
#define O_APPEND 0x0010 /* set append mode */ #define O_APPEND 0x0010 /* set append mode */
#if !defined(_POSIX_SOURCE) && !defined(__GNO__) #if !defined(_POSIX_SOURCE) && !defined(__GNO__)
/* not yet implemented in GNO */ #error not yet implemented in GNO
#define O_SHLOCK conflicts with o_binary /* open with shared file lock */ #define O_SHLOCK conflicts with o_binary /* open with shared file lock */
#define O_EXLOCK conflicts with o_trans /* open with exclusive file lock */ #define O_EXLOCK conflicts with o_trans /* open with exclusive file lock */
#define O_ASYNC 0x0400 /* signal pgrp when data ready */ #define O_ASYNC 0x0400 /* signal pgrp when data ready */
@ -90,7 +90,7 @@
#define O_TRUNC 0x0040 /* truncate to zero length */ #define O_TRUNC 0x0040 /* truncate to zero length */
#define O_EXCL 0x0080 /* error if already exists */ #define O_EXCL 0x0080 /* error if already exists */
#if defined(KERNEL) && !defined(__GNO__) #if defined(KERNEL) && !defined(__GNO__)
/* not used in GNO */ #error not used in GNO
#define FMARK 0x1000 /* mark during gc() */ #define FMARK 0x1000 /* mark during gc() */
#define FDEFER 0x2000 /* defer for next gc pass */ #define FDEFER 0x2000 /* defer for next gc pass */
#define FHASLOCK 0x4000 /* descriptor holds advisory lock */ #define FHASLOCK 0x4000 /* descriptor holds advisory lock */
@ -136,6 +136,7 @@
#ifdef __GNO__ #ifdef __GNO__
#define F_DUPFD 1 /* duplicate file descriptor */ #define F_DUPFD 1 /* duplicate file descriptor */
#else #else
#error __GNO__ is not defined
/* command values */ /* command values */
#define F_DUPFD 0 /* duplicate file descriptor */ #define F_DUPFD 0 /* duplicate file descriptor */

View File

@ -36,7 +36,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)param.h 8.2 (Berkeley) 1/21/94 * @(#)param.h 8.2 (Berkeley) 1/21/94
* $Id: param.h,v 1.1 1997/02/28 04:42:14 gdr Exp $ * $Id: param.h,v 1.2 1997/02/28 04:56:45 gdr Exp $
*/ */
#ifndef _SYS_PARAM_H_ #ifndef _SYS_PARAM_H_
@ -218,6 +218,7 @@
#endif #endif
#ifndef __GNO__ #ifndef __GNO__
#error whoops, blew a seam
/* /*
* Constants for setting the parameters of the kernel memory allocator. * Constants for setting the parameters of the kernel memory allocator.
* *

View File

@ -36,7 +36,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)signal.h 8.2 (Berkeley) 1/21/94 * @(#)signal.h 8.2 (Berkeley) 1/21/94
* $Id: signal.h,v 1.1 1997/02/28 04:42:15 gdr Exp $ * $Id: signal.h,v 1.2 1997/02/28 04:56:45 gdr Exp $
*/ */
#ifndef _SYS_SIGNAL_H_ #ifndef _SYS_SIGNAL_H_
@ -112,6 +112,7 @@ struct sigaction {
#ifdef __GNO__ #ifdef __GNO__
void (*sa_handler)(int, void (*)(void)); /* signal handler */ void (*sa_handler)(int, void (*)(void)); /* signal handler */
#else #else
#error __GNO__ is not defined
void (*sa_handler)(); /* signal handler */ void (*sa_handler)(); /* signal handler */
#endif #endif
sigset_t sa_mask; /* signal mask to apply */ sigset_t sa_mask; /* signal mask to apply */

View File

@ -31,7 +31,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)wait.h 8.1 (Berkeley) 6/2/93 * @(#)wait.h 8.1 (Berkeley) 6/2/93
* $Id: wait.h,v 1.1 1997/02/28 04:42:17 gdr Exp $ * $Id: wait.h,v 1.2 1997/02/28 04:56:45 gdr Exp $
*/ */
#ifndef _SYS_WAIT_H_ #ifndef _SYS_WAIT_H_
@ -53,6 +53,7 @@
#ifdef __GNO__ #ifdef __GNO__
#define WCOREFLAG 0000 /* no core dump under GNO */ #define WCOREFLAG 0000 /* no core dump under GNO */
#else #else
#error arch problems
#define WCOREFLAG 0200 #define WCOREFLAG 0200
#endif #endif
#endif /* ! _POSIX_SOURCE */ #endif /* ! _POSIX_SOURCE */