From 013328966a0c556f671e6eb22ecdd74d3f477803 Mon Sep 17 00:00:00 2001
From: Karl Ramm <kcr@mit.edu>
Date: Wed, 24 Dec 2008 19:56:22 +0000
Subject: remove macros complicating behind-the-scenes rearranging

---
 h/internal.h      |  4 ++++
 h/zephyr/zephyr.h | 13 ++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'h')

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
-- 
cgit v1.2.3