diff options
| author |  John F. Carr <jfc@mit.edu> | 1991-06-20 07:33:52 +0000 |
|---|---|---|
| committer | John F. Carr <jfc@mit.edu> | 1991-06-20 07:33:52 +0000 |
| commit | ce356da5947c2efa03e0cb8999e0e589e801c606 (patch) | |
| tree | 108dcc068504a50d4497d0889fa518d29fa7744f /h/zephyr | |
| parent | 2323f1307e8541a68ab65b082f161020427aca04 (diff) | |
Complete renaming of subscription structure fields.
In Athena 7.3, there will be a <stdarg.h>.
Diffstat (limited to 'h/zephyr')
| -rw-r--r-- | h/zephyr/zephyr.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/h/zephyr/zephyr.h b/h/zephyr/zephyr.h index 4160e6b..08b42c4 100644 --- a/h/zephyr/zephyr.h +++ b/h/zephyr/zephyr.h @@ -28,7 +28,7 @@ #include <stdio.h> #ifndef va_start /* guaranteed to be a macro */ -#if defined(__STDC__) && (defined(__GNUC__) || !defined(ibm032)) +#ifdef __STDC__ #include <stdarg.h> #else #include <varargs.h> @@ -124,19 +124,11 @@ extern "C" { /* Subscription structure */ typedef struct _ZSubscriptions_t { - char *recipient; -#ifdef __cplusplus + char *zsub_recipient; + /* The following field used to be named "class", but that + conflicts with C++ */ char *zsub_class; -#else - char *class; /* compat */ -#endif - char *classinst; - /* Please use these preferred names; those above will go away soon. */ -#define zsub_recipient recipient -#ifndef __cplusplus -#define zsub_class class -#endif -#define zsub_classinst classinst + char *zsub_classinst; } ZSubscription_t; /* Function return code */ |