cc-hash.c (fhash): The FILE name may be null.

[u/mdw/catacomb] / lmem.c

diff --git a/lmem.c b/lmem.c
index 1d4ae87..a7033d0 100644 (file)
--- a/lmem.c
+++ b/lmem.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: lmem.c,v 1.6 2004/04/08 01:36:15 mdw Exp $
+ * $Id$
  *
  * Locked memory allocation (Unix-specific)
  *
  * (c) 1999 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,12 +15,12 @@
  * 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,
@@ -307,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@ --- *