remove macros complicating behind-the-scenes rearranging

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

diff --git a/zephyr/h/internal.h b/zephyr/h/internal.h
index 62a467d1d4fb4415f60e7d598732dfe6c136aea6..e00721ca3d73cb18890c3bb8e26ff421d2dd9905 100644 (file)
--- a/zephyr/h/internal.h
+++ b/zephyr/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/zephyr/h/zephyr/zephyr.h b/zephyr/h/zephyr/zephyr.h
index 230074486cb40c6d7ed7a0eaa5d329ac7746036d..0346e0550cd9360a641a5356f98e459d8ac8132e 100644 (file)
--- a/zephyr/h/zephyr/zephyr.h
+++ b/zephyr/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

diff --git a/zephyr/lib/Makefile.in b/zephyr/lib/Makefile.in
index 64e3692c4511a1915e782fc7ba8a5383fb4fa7da..1e80f8446402d45a31dac7660165a2859a70c664 100644 (file)
--- a/zephyr/lib/Makefile.in
+++ b/zephyr/lib/Makefile.in
@@ -47,7 +47,7 @@ OBJS =        zephyr_err.lo ZAsyncLocate.lo ZCkAuth.lo ZCkIfNot.lo ZClosePort.lo \
 all: libzephyr.la
 
 libzephyr.la: ${OBJS}
-       ${LIBTOOL} --mode=link ${CC} -rpath ${libdir} -version-info 3:0:0 \
+       ${LIBTOOL} --mode=link ${CC} -rpath ${libdir} -version-info 4:0:0 \
          ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 zephyr_err.c ${BUILDTOP}/h/zephyr/zephyr_err.h: zephyr_err.et

diff --git a/zephyr/lib/ZInit.c b/zephyr/lib/ZInit.c
index 0c840683c2fbcc4fb3d7f53e083288f9bf5b7ccc..8f642571be177c65ffc78e9f62b01632e784e4b9 100644 (file)
--- a/zephyr/lib/ZInit.c
+++ b/zephyr/lib/ZInit.c
@@ -194,4 +194,19 @@ ZInitialize(void)
     return (ZERR_NONE);
 }
 
-const char * ZGetRealm (void) { return __Zephyr_realm; }
+const char * ZGetRealm (void) {
+    return __Zephyr_realm;
+}
+
+int ZGetFD (void) {
+    return __Zephyr_fd;
+}
+
+int ZQLength (void) {
+    return __Q_CompleteLength;
+}
+
+struct sockaddr_in ZGetDestAddr (void) {
+    return __HM_addr;
+}
+

diff --git a/zephyr/lib/Zinternal.c b/zephyr/lib/Zinternal.c
index 1edb8917298def9529f87646990910ef8a1d7e08..d5e0e440869605214bbc57cccffb08545192bd07 100644 (file)
--- a/zephyr/lib/Zinternal.c
+++ b/zephyr/lib/Zinternal.c
@@ -1261,15 +1261,6 @@ ZSetDebug(void (*proc) __P((const char *, va_list, void *)),
 }
 #endif /* Z_DEBUG */
 
-#undef ZGetFD
-int ZGetFD (void) { return __Zephyr_fd; }
-
-#undef ZQLength
-int ZQLength (void) { return __Q_CompleteLength; }
-
-#undef ZGetDestAddr
-struct sockaddr_in ZGetDestAddr (void) { return __HM_addr; }
-
 #ifdef HAVE_KRB5
 Code_t
 Z_Checksum(krb5_data *cksumbuf,