Broke out assert define into it's own include. Relied upon by MemPool

diff --git a/include/MemPool.h b/include/MemPool.h
index a337d19b07a53d81d59df1d680a5fb1e9656bb8d..68cfb27be9cbe2989436054ea1d6fd7a57f4dd10 100644 (file)
--- a/include/MemPool.h
+++ b/include/MemPool.h
@@ -3,6 +3,7 @@
 #define _MEM_POOLS_H_
 
 #include "config.h"
+#include "assert.h"
 #include "util.h"
 
 #include "memMeter.h"

diff --git a/include/assert.h b/include/assert.h
new file mode 100644 (file)
index 0000000..82aafe6
--- /dev/null
+++ b/include/assert.h
@@ -0,0 +1,53 @@
+
+/*
+ * $Id: assert.h,v 1.1 2006/05/10 21:04:24 hno Exp $
+ *
+ * AUTHOR: Duane Wessels
+ *
+ * SQUID Web Proxy Cache          http://www.squid-cache.org/
+ * ----------------------------------------------------------
+ *
+ *  Squid is the result of efforts by numerous individuals from
+ *  the Internet community; see the CONTRIBUTORS file for full
+ *  details.   Many organizations have provided support for Squid's
+ *  development; see the SPONSORS file for full details.  Squid is
+ *  Copyrighted (C) 2001 by the Regents of the University of
+ *  California; see the COPYRIGHT file for full details.  Squid
+ *  incorporates software developed and/or copyrighted by other
+ *  sources; see the CREDITS file for full details.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  This program 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 General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ *
+ */
+
+#ifndef SQUID_ASSERT_H
+#define SQUID_ASSERT_H
+
+#include "config.h"
+
+#include "assert.h"
+
+#if PURIFY
+#define assert(EX) ((void)0)
+#elif defined(NODEBUG)
+#define assert(EX) ((void)0)
+#elif STDC_HEADERS
+#define assert(EX)  ((EX)?((void)0):xassert( # EX , __FILE__, __LINE__))
+#else
+#define assert(EX)  ((EX)?((void)0):xassert("EX", __FILE__, __LINE__))
+#endif
+extern void xassert(const char *, const char *, int);
+
+#endif

diff --git a/src/protos.h b/src/protos.h
index 7ba88cac021be56c174b01d2859e2ded0c8ec41c..078ee451cea2fa9fcc755479a9fa7dd0deb2fffb 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: protos.h,v 1.530 2006/05/08 23:38:33 robertc Exp $
+ * $Id: protos.h,v 1.531 2006/05/10 21:04:24 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -175,7 +175,6 @@ SQUIDCEXTERN void _db_print(const char *,...) PRINTF_FORMAT_ARG1;
 #else
 SQUIDCEXTERN void _db_print();
 #endif
-extern void xassert(const char *, const char *, int);
 
 /* packs, then prints an object using debug() */
 SQUIDCEXTERN void debugObj(int section, int level, const char *label, void *obj, ObjPackMethod pm);

diff --git a/src/squid.h b/src/squid.h
index 359d1dbf05b40915bdb7241eee02bd72b6d14457..c910a2c7ad085da0752870bfdccd25ebe37c8015 100644 (file)
--- a/src/squid.h
+++ b/src/squid.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.251 2006/05/07 15:18:39 serassio Exp $
+ * $Id: squid.h,v 1.252 2006/05/10 21:04:24 hno Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -37,16 +37,7 @@
 
 #include "config.h"
 
-#if PURIFY
-#define assert(EX) ((void)0)
-#elif defined(NODEBUG)
-#define assert(EX) ((void)0)
-#elif STDC_HEADERS
-#define assert(EX)  ((EX)?((void)0):xassert( # EX , __FILE__, __LINE__))
-#else
-#define assert(EX)  ((EX)?((void)0):xassert("EX", __FILE__, __LINE__))
-#endif
-extern void xassert(const char *, const char *, int);
+#include "assert.h"
 
 #if HAVE_UNISTD_H
 #include <unistd.h>