summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--monitor_mm.h5
2 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c720182a..6d077d7fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,9 @@
36 - djm@cvs.openbsd.org 2008/04/18 22:01:33 36 - djm@cvs.openbsd.org 2008/04/18 22:01:33
37 [session.c] 37 [session.c]
38 remove unneccessary parentheses 38 remove unneccessary parentheses
39 - otto@cvs.openbsd.org 2008/04/29 11:20:31
40 [monitor_mm.h]
41 garbage collect two unused fields in struct mm_master; ok markus@
39 42
4020080403 4320080403
41 - (djm) [openbsd-compat/bsd-poll.c] Include stdlib.h to avoid compile- 44 - (djm) [openbsd-compat/bsd-poll.c] Include stdlib.h to avoid compile-
@@ -3896,4 +3899,4 @@
3896 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3899 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3897 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3900 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3898 3901
3899$Id: ChangeLog,v 1.4913 2008/05/19 04:55:02 djm Exp $ 3902$Id: ChangeLog,v 1.4914 2008/05/19 04:55:29 djm Exp $
diff --git a/monitor_mm.h b/monitor_mm.h
index 36a07a06d..c890f7709 100644
--- a/monitor_mm.h
+++ b/monitor_mm.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor_mm.h,v 1.4 2006/08/03 03:34:42 deraadt Exp $ */ 1/* $OpenBSD: monitor_mm.h,v 1.5 2008/04/29 11:20:31 otto Exp $ */
2 2
3/* 3/*
4 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 4 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
@@ -41,9 +41,6 @@ struct mm_master {
41 size_t size; 41 size_t size;
42 42
43 struct mm_master *mmalloc; /* Used to completely share */ 43 struct mm_master *mmalloc; /* Used to completely share */
44
45 int write; /* used to writing to other party */
46 int read; /* used for reading from other party */
47}; 44};
48 45
49RB_PROTOTYPE(mmtree, mm_share, next, mm_compare) 46RB_PROTOTYPE(mmtree, mm_share, next, mm_compare)