remove vax handling

ok millert

2 files changed, 3 insertions, 8 deletions

diff --git a/sys/lib/libz/inflate.c b/sys/lib/libz/inflate.c
index 6b8b3237506..5204a869c70 100644
--- a/sys/lib/libz/inflate.c
+++ b/sys/lib/libz/inflate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inflate.c,v 1.13 2005/07/20 15:56:46 millert Exp $	*/
+/*	$OpenBSD: inflate.c,v 1.14 2016/03/23 19:39:48 natano Exp $	*/
 /* inflate.c -- zlib decompression
  * Copyright (C) 1995-2005 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
@@ -575,10 +575,7 @@ int flush;
     static const unsigned short order[19] = /* permutation of code lengths */
         {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
 
-    if (strm == Z_NULL || strm->state == Z_NULL ||
-#ifndef __vax__
-	strm->next_out == Z_NULL ||
-#endif
+    if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL ||
         (strm->next_in == Z_NULL && strm->avail_in != 0))
         return Z_STREAM_ERROR;
 
diff --git a/sys/ufs/ufs/ufs_dirhash.c b/sys/ufs/ufs/ufs_dirhash.c
index af501244a49..9f2a92e02c7 100644
--- a/sys/ufs/ufs/ufs_dirhash.c
+++ b/sys/ufs/ufs/ufs_dirhash.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ufs_dirhash.c,v 1.34 2016/02/27 18:50:38 natano Exp $	*/
+/* $OpenBSD: ufs_dirhash.c,v 1.35 2016/03/23 19:39:48 natano Exp $	*/
 /*
  * Copyright (c) 2001, 2002 Ian Dowse.  All rights reserved.
  *
@@ -1054,8 +1054,6 @@ ufsdirhash_init(void)
 	TAILQ_INIT(&ufsdirhash_list);
 #if defined (__sparc__) && !defined (__sparc64__)
 	if (!CPU_ISSUN4OR4C)
-#elif defined (__vax__)
-	if (0)
 #endif
 		ufs_dirhashmaxmem = 2 * 1024 * 1024;
 	ufs_mindirhashsize = 5 * DIRBLKSIZ;