We don't really need a macro for ZGetRealm, do we?

git-svn-id: svn://svn.1ts.org/debian/branches/zephyr-reloaded@379 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f

diff --git a/zephyr/h/zephyr/zephyr.h b/zephyr/h/zephyr/zephyr.h
index 45971fb1418221ff2f0110718b61a267b4506324..230074486cb40c6d7ed7a0eaa5d329ac7746036d 100644 (file)
--- a/zephyr/h/zephyr/zephyr.h
+++ b/zephyr/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/zephyr/lib/ZInit.c b/zephyr/lib/ZInit.c
index 8b26f8aa8c4c222e0ad6adbb2aba003c648d3857..0c840683c2fbcc4fb3d7f53e083288f9bf5b7ccc 100644 (file)
--- a/zephyr/lib/ZInit.c
+++ b/zephyr/lib/ZInit.c
@@ -194,3 +194,4 @@ ZInitialize(void)
     return (ZERR_NONE);
 }
 
+const char * ZGetRealm (void) { return __Zephyr_realm; }

diff --git a/zephyr/lib/Zinternal.c b/zephyr/lib/Zinternal.c
index 7b4b1c0ca0d23764d67670749964d6f19bf13e62..5947a3ae100082907ca1272e25e4ad0191ad0d14 100644 (file)
--- a/zephyr/lib/Zinternal.c
+++ b/zephyr/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 *)),