LIST_HEAD collides with netbsd sys/queue.h, rename defines in atalk/list.h to ATALK_LIST_

diff --git a/include/atalk/list.h b/include/atalk/list.h
index 59206f410b99847799617d35f006aecb0354005b..775715b132bc29917c3a3375c734715cd3d8aa90 100644 (file)
--- a/include/atalk/list.h
+++ b/include/atalk/list.h
@@ -17,12 +17,12 @@ struct list_head {
     struct list_head *next, *prev;
 };
 
-#define LIST_HEAD_INIT(name) { &(name), &(name) }
+#define ATALK_LIST_HEAD_INIT(name) { &(name), &(name) }
 
-#define LIST_HEAD(name) \
+#define ATALK_LIST_HEAD(name) \
     struct list_head name = LIST_HEAD_INIT(name)
 
-#define INIT_LIST_HEAD(ptr) do { \
+#define ATALK_INIT_LIST_HEAD(ptr) do { \
     (ptr)->next = (ptr); (ptr)->prev = (ptr); \
 } while (0)
 

diff --git a/include/atalk/unicode.h b/include/atalk/unicode.h
index bdb217528d0ac0339ed693f05e213160a0b7ed7d..3165f6a99ac726ad3f83b5d89e17126ce4f1c6d7 100644 (file)
--- a/include/atalk/unicode.h
+++ b/include/atalk/unicode.h
@@ -3,7 +3,6 @@
 #define _ATALK_UNICODE_H 1
 
 #include <sys/cdefs.h>
-#include <atalk/list.h>
 
 #define ucs2_t u_int16_t
 

diff --git a/libatalk/cnid/cnid.c b/libatalk/cnid/cnid.c
index 0c226e0e8ed3c8aa3ce7d831d3bfedaff724f617..8ce79c948abf4fb553725395bba6e8888819220f 100644 (file)
--- a/libatalk/cnid/cnid.c
+++ b/libatalk/cnid/cnid.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: cnid.c,v 1.1.4.4 2003-10-12 16:25:19 didg Exp $
+ * $Id: cnid.c,v 1.1.4.5 2003-10-30 03:31:33 bfernhomberg Exp $
  *
  * Copyright (c) 2003 the Netatalk Team
  * Copyright (c) 2003 Rafal Lewczuk <rlewczuk@pronet.pl>
@@ -31,7 +31,7 @@
 #include <time.h>
 
 /* List of all registered modules. */
-static struct list_head modules = LIST_HEAD_INIT(modules);
+static struct list_head modules = ATALK_LIST_HEAD_INIT(modules);
 
 static sigset_t sigblockset;
 static const struct itimerval none = {{0, 0}, {0, 0}};