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 /lib | |
| parent | 3fd3cd7c62a13af57d84238617acbcd91d27c682 (diff) | |
remove macros complicating behind-the-scenes rearranging
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.in | 2 | ||||
| -rw-r--r-- | lib/ZInit.c | 17 | ||||
| -rw-r--r-- | lib/Zinternal.c | 9 |
3 files changed, 17 insertions, 11 deletions
diff --git a/lib/Makefile.in b/lib/Makefile.in index 64e3692..1e80f84 100644 --- a/lib/Makefile.in +++ b/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/lib/ZInit.c b/lib/ZInit.c index 0c84068..8f64257 100644 --- a/lib/ZInit.c +++ b/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/lib/Zinternal.c b/lib/Zinternal.c index 1edb891..d5e0e44 100644 --- a/lib/Zinternal.c +++ b/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, |