Kludge around the whole ISC_LIST botch by removing the offending definition, which...

diff --git a/includes/isc/types.h b/includes/isc/types.h
index da318061987c49ff1ceb716af305ee06b1b96225..e88761f0088db1e24913ed1fab401ea520c14e59 100644 (file)
--- 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;