X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/4e66da02f19648ee1be862e67ba1d1fc5549fb7f..78614e02310dbe879d55f0a68e47349db074ff61:/lmem.c

diff --git a/lmem.c b/lmem.c
index e534d4a..a7033d0 100644
--- a/lmem.c
+++ b/lmem.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: lmem.c,v 1.5 2004/04/02 01:03:49 mdw Exp $
+ * $Id$
  *
  * Locked memory allocation (Unix-specific)
  *
  * (c) 1999 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,38 +15,18 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * Catacomb is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with Catacomb; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * 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@ --- *