From: Ted Lemon <source@isc.org>
Date: Thu, 27 Jan 2000 23:31:34 +0000 (+0000)
Subject: Kludge around the whole ISC_LIST botch by removing the offending definition, which... 
X-Git-Tag: V3-BETA-2-PATCH-1~378
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0664d68a8eacb5614deea36bff7c3175b39d1563;p=thirdparty%2Fdhcp.git

Kludge around the whole ISC_LIST botch by removing the offending definition, which is not used.
---

diff --git a/includes/isc/types.h b/includes/isc/types.h
index da3180619..e88761f00 100644
--- a/includes/isc/types.h
+++ b/includes/isc/types.h
@@ -22,21 +22,6 @@
 #include <isc/boolean.h>
 #include <isc/list.h>
 
-/* This is a bit of an ugly: if you are using NSUPDATE, you are also
- * including (by means of -I...) the include files that are installed
- * by BIND.  The problem is that the BIND includes also have an
- * isc/list.h, which gets included above rather than the isc/list.h
- * that is packaged with the DHCP server.  The BIND version of the
- * include does not prepend the macros with "ISC_", the one with the
- * DHCP's isc/list.h does.  Sigh.
- *
- * Fixed in BIND 9.  Double sigh.  This is a temporary fix - we'll
- * come up with something more correct later.
- */
-#ifdef NSUPDATE
-#define ISC_LIST LIST
-#endif
-
 /***
  *** Core Types.
  ***/
@@ -47,7 +32,6 @@ typedef struct isc_mempool		isc_mempool_t;
 typedef struct isc_msgcat		isc_msgcat_t;
 typedef unsigned int			isc_eventtype_t;
 typedef struct isc_event		isc_event_t;
-typedef ISC_LIST(struct isc_event)	isc_eventlist_t;
 typedef struct isc_task			isc_task_t;
 typedef struct isc_taskmgr		isc_taskmgr_t;
 typedef struct isc_rwlock		isc_rwlock_t;