diff options
| author |  Richard Basch <probe@mit.edu> | 1993-11-20 23:23:09 +0000 |
|---|---|---|
| committer | Richard Basch <probe@mit.edu> | 1993-11-20 23:23:09 +0000 |
| commit | f88d9f051df27c86af102da0a327b7ceb4250c9c (patch) | |
| tree | 96d0f3f9e2ff6703e428df032bdeccf63cc19a34 /h/zephyr | |
| parent | e875fe89d9168efb7128dba5dac203ba242c7b2b (diff) | |
More readable (untested for Ultrix 2.2)
Diffstat (limited to 'h/zephyr')
| -rw-r--r-- | h/zephyr/zephyr_conf.h | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/h/zephyr/zephyr_conf.h b/h/zephyr/zephyr_conf.h index 2ef4fc7..850c85a 100644 --- a/h/zephyr/zephyr_conf.h +++ b/h/zephyr/zephyr_conf.h @@ -40,28 +40,21 @@ #ifdef ultrix /* If you are using Ultrix versions prior to 3.0, uncomment the following - three lines so that users don't need to specify -DULTRIX22 on their - compile lines. */ + * three lines so that users don't need to specify -DULTRIX22 on their + * compile lines. */ + /* #ifndef ULTRIX22 */ /* #define ULTRIX22 */ /* #endif */ -#endif /* ultrix */ -#if (defined(ultrix) && defined(ULTRIX22)) -/* Ultrix 3.0 and beyond have these defined in standard places */ -/* Ultrix 2.2 and previous don't have these defined */ +#ifdef ULTRIX22 #define MAXHOSTNAMELEN 64 typedef int uid_t; typedef int gid_t; -#ifndef Z_HaveKerberos -#define FD_ZERO(p) ((p)->fds_bits[0] = 0) -#define FD_SET(n, p) ((p)->fds_bits[0] |= (1 << (n))) -#define FD_ISSET(n, p) ((p)->fds_bits[0] & (1 << (n))) -#endif /* KERBEROS */ -#define FD_CLR(n, p) ((p)->fds_bits[0] &= ~(1 << (n))) -#endif /* ultrix */ +#endif +#endif -#ifdef macII +#if defined(macII) || defined(ULTRIX22) #define FD_ZERO(p) ((p)->fds_bits[0] = 0) #define FD_SET(n, p) ((p)->fds_bits[0] |= (1 << (n))) #define FD_ISSET(n, p) ((p)->fds_bits[0] & (1 << (n))) @@ -72,6 +65,6 @@ typedef int gid_t; #define REALM_SZ MAXHOSTNAMELEN #define INST_SZ 0 /* no instances w/o Kerberos */ #define ANAME_SZ 9 /* size of a username + null */ -#endif /* !KERBEROS */ +#endif #endif /* __ZEPHYR_CONF_H__ */ |