From 459ed6dfdbbd244cabd08527f4e37b1246954ffe Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Sun, 3 Aug 1997 08:25:01 +0000
Subject: Kill #ifndef NEWVM etc.  It affected a lot of other things besides VM
 structure (eg: credentials etc) and it's highly unlikely we'll ever get to
 see the "tainted" BSD<=4.3 VM code in public use.  Although it indicated the
 way some things used to be done, it obfuscates things too much.

---
 bin/ps/ps.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'bin/ps/ps.c')

diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index 93ab9de..c854e8e 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ps.c,v 1.19 1997/04/29 05:26:05 jkh Exp $
+ *	$Id: ps.c,v 1.20 1997/06/06 06:40:06 charnier Exp $
  */
 
 #ifndef lint
@@ -68,10 +68,6 @@ static char const sccsid[] = "@(#)ps.c	8.4 (Berkeley) 4/2/94";
 
 #include "ps.h"
 
-#ifdef P_PPWAIT
-#define NEWVM
-#endif
-
 KINFO *kinfo;
 struct varent *vhead, *vtail;
 
@@ -476,12 +472,8 @@ pscomp(a, b)
 	const void *a, *b;
 {
 	int i;
-#ifdef NEWVM
 #define VSIZE(k) (KI_EPROC(k)->e_vm.vm_dsize + KI_EPROC(k)->e_vm.vm_ssize + \
 		  KI_EPROC(k)->e_vm.vm_tsize)
-#else
-#define VSIZE(k) ((k)->ki_p->p_dsize + (k)->ki_p->p_ssize + (k)->ki_e->e_xsize)
-#endif
 
 	if (sortby == SORTCPU)
 		return (getpcpu((KINFO *)b) - getpcpu((KINFO *)a));
-- 
cgit v1.1