summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/make/arch.c9
-rw-r--r--usr.bin/make/buf.c4
2 files changed, 9 insertions, 4 deletions
diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c
index dc8ebce66ff..26bb6481682 100644
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: arch.c,v 1.46 2001/05/29 12:53:38 espie Exp $ */
+/* $OpenBSD: arch.c,v 1.47 2001/05/30 00:43:00 deraadt Exp $ */
/* $NetBSD: arch.c,v 1.17 1996/11/06 17:58:59 christos Exp $ */
/*
@@ -602,7 +602,7 @@ ArchMTimeMember(archive, member, hash)
if (he != NULL)
return mtime_of_member(he);
else {
- if (end - member > AR_NAME_SIZE) {
+ if ((size_t)(end - member) > AR_NAME_SIZE) {
/* Try truncated name. */
end = member + AR_NAME_SIZE;
he = ohash_find(&ar->members,
@@ -890,6 +890,7 @@ Arch_Touch(gn)
ArchTouch(Varq_Value(ARCHIVE_INDEX, gn), Varq_Value(MEMBER_INDEX, gn));
}
+/*ARGSUSED*/
void
Arch_TouchLib(gn)
GNode *gn; /* The node of the library to touch */
@@ -899,6 +900,8 @@ Arch_TouchLib(gn)
ArchTouch(gn->path, RANLIBMAG);
set_times(gn->path);
}
+#else
+ gn = gn;
#endif
}
@@ -1019,7 +1022,9 @@ bool
Arch_LibOODate(gn)
GNode *gn; /* The library's graph node */
{
+#ifdef RANLIBMAG
TIMESTAMP modTimeTOC; /* mod time of __.SYMDEF */
+#endif
if (OP_NOP(gn->type) && Lst_IsEmpty(&gn->children))
return false;
diff --git a/usr.bin/make/buf.c b/usr.bin/make/buf.c
index 36f69874e84..094b26ddc2a 100644
--- a/usr.bin/make/buf.c
+++ b/usr.bin/make/buf.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: buf.c,v 1.17 2001/05/29 12:17:03 espie Exp $ */
+/* $OpenBSD: buf.c,v 1.18 2001/05/30 00:43:00 deraadt Exp $ */
/* $NetBSD: buf.c,v 1.9 1996/12/31 17:53:21 christos Exp $ */
/*
@@ -128,7 +128,7 @@ Buf_AddChars(bp, numBytes, bytesPtr)
const char *bytesPtr;
{
- if (bp->endPtr - bp->inPtr < numBytes+1)
+ if ((size_t)(bp->endPtr - bp->inPtr) < numBytes+1)
BufExpand(bp, numBytes);
memcpy(bp->inPtr, bytesPtr, numBytes);