summaryrefslogtreecommitdiff
path: root/kerberosV
diff options
context:
space:
mode:
authorHans Insulander <hin@cvs.openbsd.org>2001-07-11 09:36:06 +0000
committerHans Insulander <hin@cvs.openbsd.org>2001-07-11 09:36:06 +0000
commit3832fe311c10bfb3af00ee2182472390def76665 (patch)
treeba09472a60a7e92fd5bd8772bfa17e2ec1cd3809 /kerberosV
parente1534a39f432cf83ba9bb2baec20bddf0feb5326 (diff)
Use our swap16 and swap32 instead of the ones in libroken.
Diffstat (limited to 'kerberosV')
-rw-r--r--kerberosV/include/roken.h7
-rw-r--r--kerberosV/lib/krb5/Makefile3
-rw-r--r--kerberosV/lib/roken/Makefile3
3 files changed, 5 insertions, 8 deletions
diff --git a/kerberosV/include/roken.h b/kerberosV/include/roken.h
index 9e0e1d2c630..486d4e0442e 100644
--- a/kerberosV/include/roken.h
+++ b/kerberosV/include/roken.h
@@ -38,7 +38,7 @@
* SUCH DAMAGE.
*/
-/* $Id: roken.h,v 1.4 2001/06/27 15:22:42 hin Exp $ */
+/* $Id: roken.h,v 1.5 2001/07/11 09:36:05 hin Exp $ */
#include <stdio.h>
#include <stdlib.h>
@@ -138,9 +138,8 @@ const char *get_default_username (void);
void pidfile (const char*);
-unsigned int bswap32(unsigned int);
-
-unsigned short bswap16(unsigned short);
+#define bswap32 swap32
+#define bswap16 swap16
time_t tm2time (struct tm tm, int local);
diff --git a/kerberosV/lib/krb5/Makefile b/kerberosV/lib/krb5/Makefile
index fe7089079ae..6ac0f805eed 100644
--- a/kerberosV/lib/krb5/Makefile
+++ b/kerberosV/lib/krb5/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2001/07/11 09:21:15 hin Exp $
+# $OpenBSD: Makefile,v 1.15 2001/07/11 09:36:05 hin Exp $
KRBDEPTH=../..
.include <${.CURDIR}/../../Makefile.inc>
@@ -230,7 +230,6 @@ SRCS= add_et_list.c \
# These are files in libroken that are needed in libkrb5 to make it independant
# from libroken.
SRCS+= base64.c \
- bswap.c \
issuid.c \
getaddrinfo_hostspec.c \
getarg.c \
diff --git a/kerberosV/lib/roken/Makefile b/kerberosV/lib/roken/Makefile
index e2e28230c3f..8ba0ab1987a 100644
--- a/kerberosV/lib/roken/Makefile
+++ b/kerberosV/lib/roken/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2001/06/23 00:17:45 hin Exp $
+# $OpenBSD: Makefile,v 1.5 2001/07/11 09:36:05 hin Exp $
LIB = roken
@@ -13,7 +13,6 @@ test:
CFLAGS += -I.
SRCS= base64.c \
- bswap.c \
concat.c \
emalloc.c \
eread.c \