Merge branch 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/public-git/catacomb/

[u/mdw/catacomb] / lmem.c

diff --git a/lmem.c b/lmem.c
index e534d4a..5c36e98 100644 (file)
--- a/lmem.c
+++ b/lmem.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: lmem.c,v 1.5 2004/04/02 01:03:49 mdw Exp $
+ * $Id$
  *
  * Locked memory allocation (Unix-specific)
  *
@@ -27,26 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: lmem.c,v $
- * Revision 1.5  2004/04/02 01:03:49  mdw
- * Miscellaneous constification.
- *
- * Revision 1.4  2002/01/24 22:26:11  mdw
- * Fix build failure when @mlock@ not available.
- *
- * Revision 1.3  2000/07/29 21:58:15  mdw
- * (l_destroy): New function for destroying locked memory blocks.
- *
- * Revision 1.2  2000/06/17 11:29:20  mdw
- * Add arena support.
- *
- * Revision 1.1  1999/12/22 16:02:52  mdw
- * Interface to allocating `locked' memory (which isn't paged out).
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include "config.h"
@@ -327,10 +307,12 @@ void l_destroy(lmem *lm)
   }
   memset(lm->p, 0, lm->sz);
 
+#ifdef HAVE_MLOCK
   if (lm->f & LF_LOCKED)
     munmap(lm->p, lm->sz);
   else
-    free(lm->p);
+#endif
+    free(lm->p); /*sic*/
 }
 
 /* --- @l_report@ --- *