[xiph-commits] r13427 - in experimental/moritz: thread xalloc

[moritz at svn.xiph.org]

Author: moritz
Date: 2007-08-02 09:43:07 -0700 (Thu, 02 Aug 2007)
New Revision: 13427

Modified:
   experimental/moritz/thread/Makefile
   experimental/moritz/thread/thread.c
   experimental/moritz/xalloc/Makefile
   experimental/moritz/xalloc/xalloc.c
Log:
Include <sys/tree.h> unconditionally and let the build take care of it.


Modified: experimental/moritz/thread/Makefile
===================================================================
--- experimental/moritz/thread/Makefile	2007-08-02 03:42:29 UTC (rev 13426)
+++ experimental/moritz/thread/Makefile	2007-08-02 16:43:07 UTC (rev 13427)
@@ -6,12 +6,13 @@
 LIBSRC =	thread.c
 LIBOBJ =	thread.o
 
+COMPAT_INCLUDES = -I../compat
 THREADS =	-pthread
 CC ?=		gcc
 CFLAGS ?=	-O2 -pipe
 CFLAGS +=	-DHAVE_CONFIG_H=1 -DTHREAD_DEBUG=1 -DXALLOC_DEBUG=1 -DXALLOC_WITH_XASPRINTF=1 -fstrict-aliasing -Wall -W -ansi -pedantic -Wwrite-strings -Wpointer-arith -Wmissing-prototypes -Wstrict-prototypes $(THREADS)
 DEBUG ?=	-g -ggdb
-INCLUDEFLAGS =	-I../compat -I../xalloc -pthread
+INCLUDEFLAGS =	$(COMPAT_INCLUDES) -I../xalloc -pthread
 LDFLAGS =	-L. -L../xalloc -lxalloc -lthread $(THREADS)
 
 

Modified: experimental/moritz/thread/thread.c
===================================================================
--- experimental/moritz/thread/thread.c	2007-08-02 03:42:29 UTC (rev 13426)
+++ experimental/moritz/thread/thread.c	2007-08-02 16:43:07 UTC (rev 13427)
@@ -31,11 +31,7 @@
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#ifdef HAVE_SYS_TREE_H
-# include <sys/tree.h>
-#else
-# include "sys/tree.h"
-#endif /* HAVE_SYS_TREE_H */
+#include <sys/tree.h>
 
 #include <errno.h>
 #ifdef HAVE_POLL_H

Modified: experimental/moritz/xalloc/Makefile
===================================================================
--- experimental/moritz/xalloc/Makefile	2007-08-02 03:42:29 UTC (rev 13426)
+++ experimental/moritz/xalloc/Makefile	2007-08-02 16:43:07 UTC (rev 13427)
@@ -6,12 +6,13 @@
 LIBSRC =	xalloc.c
 LIBOBJ =	xalloc.o
 
+COMPAT_INCLUDES = -I../compat
 THREADS =	-pthread
 CC ?=		gcc
 CFLAGS ?=	-O2 -pipe
 CFLAGS +=	-DHAVE_CONFIG_H=1 -DXALLOC_DEBUG=1 -DXALLOC_WITH_XASPRINTF=1 -fstrict-aliasing -Wall -W -ansi -pedantic -Wwrite-strings -Wpointer-arith -Wmissing-prototypes -Wstrict-prototypes $(THREADS)
 DEBUG ?=	-g -ggdb
-INCLUDEFLAGS =	-I../compat
+INCLUDEFLAGS =	$(COMPAT_INCLUDES)
 LDFLAGS =	-L. -lxalloc $(THREADS)
 
 

Modified: experimental/moritz/xalloc/xalloc.c
===================================================================
--- experimental/moritz/xalloc/xalloc.c	2007-08-02 03:42:29 UTC (rev 13426)
+++ experimental/moritz/xalloc/xalloc.c	2007-08-02 16:43:07 UTC (rev 13427)
@@ -64,11 +64,7 @@
 #endif /* THREAD_SAFE */
 
 #ifdef XALLOC_DEBUG
-# ifdef HAVE_SYS_TREE_H
-#  include <sys/tree.h>
-# else
-#  include "sys/tree.h"
-# endif
+# include <sys/tree.h>
 
 int	_memory_cmp(void *, void *);