From 186465c4f1e890705359c28d6d7563b062b3fc50 Mon Sep 17 00:00:00 2001
From: Karl Ramm <kcr@mit.edu>
Date: Mon, 22 Dec 2008 16:48:51 +0000
Subject: We don't really need a macro for ZGetRealm, do we?

---
 h/zephyr/zephyr.h | 3 ++-
 lib/ZInit.c       | 1 +
 lib/Zinternal.c   | 3 ---
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/h/zephyr/zephyr.h b/h/zephyr/zephyr.h
index 45971fb..2300744 100644
--- a/h/zephyr/zephyr.h
+++ b/h/zephyr/zephyr.h
@@ -232,7 +232,8 @@ extern char __Zephyr_realm[];
 #define ZGetFD()	__Zephyr_fd
 #define ZQLength()	__Q_CompleteLength
 #define ZGetDestAddr()	__HM_addr
-#define ZGetRealm()	__Zephyr_realm
+
+const char *ZGetRealm(void);
 
 
 #ifdef Z_DEBUG
diff --git a/lib/ZInit.c b/lib/ZInit.c
index 8b26f8a..0c84068 100644
--- a/lib/ZInit.c
+++ b/lib/ZInit.c
@@ -194,3 +194,4 @@ ZInitialize(void)
     return (ZERR_NONE);
 }
 
+const char * ZGetRealm (void) { return __Zephyr_realm; }
diff --git a/lib/Zinternal.c b/lib/Zinternal.c
index 7b4b1c0..5947a3a 100644
--- a/lib/Zinternal.c
+++ b/lib/Zinternal.c
@@ -1260,9 +1260,6 @@ int ZQLength (void) { return __Q_CompleteLength; }
 #undef ZGetDestAddr
 struct sockaddr_in ZGetDestAddr (void) { return __HM_addr; }
 
-#undef ZGetRealm
-Zconst char * ZGetRealm (void) { return __Zephyr_realm; }
-
 #undef ZSetDebug
 void
 ZSetDebug(void (*proc) __P((const char *, va_list, void *)),
-- 
cgit v1.2.3