summaryrefslogtreecommitdiff
path: root/usr.bin/sort/msort.c
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>1997-06-30 04:24:41 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>1997-06-30 04:24:41 +0000
commitab026447852af8f27141e98f02890c898f63e6a9 (patch)
treeb8fe73818514dabe7b1c9e571162529f709fb27e /usr.bin/sort/msort.c
parentd33edb75d69f655eddf2462f1098d7e605c5d3e0 (diff)
Fix an unaligned access on alpha.
Diffstat (limited to 'usr.bin/sort/msort.c')
-rw-r--r--usr.bin/sort/msort.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/sort/msort.c b/usr.bin/sort/msort.c
index 9fb52005aee..24f6365a999 100644
--- a/usr.bin/sort/msort.c
+++ b/usr.bin/sort/msort.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: msort.c,v 1.4 1997/06/16 02:21:56 millert Exp $ */
+/* $OpenBSD: msort.c,v 1.5 1997/06/30 04:24:40 millert Exp $ */
/*-
* Copyright (c) 1993
@@ -40,7 +40,7 @@
#if 0
static char sccsid[] = "@(#)msort.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: msort.c,v 1.4 1997/06/16 02:21:56 millert Exp $";
+static char rcsid[] = "$OpenBSD: msort.c,v 1.5 1997/06/30 04:24:40 millert Exp $";
#endif
#endif /* not lint */
@@ -53,7 +53,7 @@ static char rcsid[] = "$OpenBSD: msort.c,v 1.4 1997/06/16 02:21:56 millert Exp $
/* Subroutines using comparisons: merge sort and check order */
#define DELETE (1)
-#define LALIGN(n) ((n+3) & ~3)
+#define LALIGN(n) ((n+(sizeof(long)-1)) & ~(sizeof(long)-1))
typedef struct mfile {
u_char *end;