diff options
| author |  Karl Ramm <kcr@mit.edu> | 2008-12-24 19:56:22 +0000 |
|---|---|---|
| committer | Karl Ramm <kcr@mit.edu> | 2008-12-24 19:56:22 +0000 |
| commit | 013328966a0c556f671e6eb22ecdd74d3f477803 (patch) | |
| tree | 47c0c0d997dd8e9ee58a945e5cbfa43176d49edf /h | |
| parent | 3fd3cd7c62a13af57d84238617acbcd91d27c682 (diff) | |
remove macros complicating behind-the-scenes rearranging
Diffstat (limited to 'h')
| -rw-r--r-- | h/internal.h | 4 | ||||
| -rw-r--r-- | h/zephyr/zephyr.h | 13 |
2 files changed, 8 insertions, 9 deletions
diff --git a/h/internal.h b/h/internal.h index 62a467d..e00721c 100644 --- a/h/internal.h +++ b/h/internal.h @@ -93,6 +93,10 @@ extern int __subscriptions_next; extern int __Zephyr_port; /* Port number */ extern struct in_addr __My_addr; +extern int __Zephyr_fd; +extern int __Q_CompleteLength; +extern struct sockaddr_in __HM_addr; +extern char __Zephyr_realm[]; typedef Code_t (*Z_SendProc) (ZNotice_t *, char *, int, int); diff --git a/h/zephyr/zephyr.h b/h/zephyr/zephyr.h index 2300744..0346e05 100644 --- a/h/zephyr/zephyr.h +++ b/h/zephyr/zephyr.h @@ -224,16 +224,11 @@ void Z_debug(const char *, ...); /* Compatibility */ #define ZNewLocateUser ZLocateUser -/* Macros to retrieve Zephyr library values. */ -extern int __Zephyr_fd; -extern int __Q_CompleteLength; -extern struct sockaddr_in __HM_addr; -extern char __Zephyr_realm[]; -#define ZGetFD() __Zephyr_fd -#define ZQLength() __Q_CompleteLength -#define ZGetDestAddr() __HM_addr - +/* Not macros to retrieve Zephyr library values. */ const char *ZGetRealm(void); +int ZGetFD (void); +int ZQLength (void); +struct sockaddr_in ZGetDestAddr (void); #ifdef Z_DEBUG |