Commit 508d2564 authored by Karl Heyes's avatar Karl Heyes

avoid header namespace clashes

svn path=/trunk/icecast/; revision=5146
parent 62ce258d
...@@ -21,9 +21,6 @@ icecast_DEPENDENCIES = $(icecast_LDADD) ...@@ -21,9 +21,6 @@ icecast_DEPENDENCIES = $(icecast_LDADD)
LIBS = @LIBS@ @XSLT_LIBS@ @SOCKET_LIBS@ @XML_LIBS@ @OGG_LIBS@ @VORBIS_LIBS@ @CURL_LIBS@ @PTHREAD_LIBS@ LIBS = @LIBS@ @XSLT_LIBS@ @SOCKET_LIBS@ @XML_LIBS@ @OGG_LIBS@ @VORBIS_LIBS@ @CURL_LIBS@ @PTHREAD_LIBS@
CFLAGS = -g @CFLAGS@ @XML_CFLAGS@ @XSLT_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@ @CURL_CFLAGS@ @PTHREAD_CFLAGS@ CFLAGS = -g @CFLAGS@ @XML_CFLAGS@ @XSLT_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@ @CURL_CFLAGS@ @PTHREAD_CFLAGS@
INCLUDES = -I$(srcdir)/net -I$(srcdir)/thread -I$(srcdir)/avl -I$(srcdir)/httpp \
-I$(srcdir)/log -I$(srcdir)/timing
debug: debug:
$(MAKE) all CFLAGS="@DEBUG@ @XML_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@" $(MAKE) all CFLAGS="@DEBUG@ @XML_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@"
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "thread.h" #include "thread/thread.h"
#include "avl.h" #include "avl/avl.h"
#include "httpp.h" #include "httpp/httpp.h"
#include "connection.h" #include "connection.h"
#include "refbuf.h" #include "refbuf.h"
......
...@@ -22,11 +22,10 @@ ...@@ -22,11 +22,10 @@
#include "os.h" #include "os.h"
#include "thread.h" #include "thread/thread.h"
#include "avl.h" #include "avl/avl.h"
#include "sock.h" #include "net/sock.h"
#include "log.h" #include "httpp/httpp.h"
#include "httpp.h"
#include "config.h" #include "config.h"
#include "global.h" #include "global.h"
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
#include <sys/types.h> #include <sys/types.h>
#include "compat.h" #include "compat.h"
#include "httpp.h" #include "httpp/httpp.h"
#include "thread.h" #include "thread/thread.h"
#include "sock.h" #include "net/sock.h"
struct _client_tag; struct _client_tag;
......
...@@ -15,12 +15,11 @@ ...@@ -15,12 +15,11 @@
#include "source.h" #include "source.h"
#include "format.h" #include "format.h"
#include "global.h" #include "global.h"
#include "httpp.h" #include "httpp/httpp.h"
#include "format_vorbis.h" #include "format_vorbis.h"
#include "format_mp3.h" #include "format_mp3.h"
#include "log.h"
#include "logging.h" #include "logging.h"
#define CATMODULE "format" #define CATMODULE "format"
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "client.h" #include "client.h"
#include "refbuf.h" #include "refbuf.h"
#include "httpp.h" #include "httpp/httpp.h"
struct source_tag; struct source_tag;
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include "format.h" #include "format.h"
#include "httpp/httpp.h" #include "httpp/httpp.h"
#include "log.h"
#include "logging.h" #include "logging.h"
#include "format_mp3.h" #include "format_mp3.h"
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include "format.h" #include "format.h"
#define CATMODULE "format-vorbis" #define CATMODULE "format-vorbis"
#include "log.h"
#include "logging.h" #include "logging.h"
#define MAX_HEADER_PAGES 10 #define MAX_HEADER_PAGES 10
......
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
#include <windows.h> #include <windows.h>
#endif #endif
#include "thread.h" #include "thread/thread.h"
#include "avl.h" #include "avl/avl.h"
#include "httpp.h" #include "httpp/httpp.h"
#include "sock.h" #include "net/sock.h"
#include "connection.h" #include "connection.h"
#include "global.h" #include "global.h"
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include "client.h" #include "client.h"
#include "stats.h" #include "stats.h"
#include "format.h" #include "format.h"
#include "log.h"
#include "logging.h" #include "logging.h"
#include "config.h" #include "config.h"
#include "util.h" #include "util.h"
......
/* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- */ /* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- */
#include <string.h> #include <string.h>
#include "thread.h" #include "thread/thread.h"
#include "avl.h" #include "avl/avl.h"
#include "httpp/httpp.h"
#include "httpp.h"
#include "connection.h" #include "connection.h"
#include "refbuf.h" #include "refbuf.h"
#include "client.h" #include "client.h"
......
...@@ -2,9 +2,8 @@ ...@@ -2,9 +2,8 @@
#include <time.h> #include <time.h>
#include <string.h> #include <string.h>
#include "thread.h" #include "thread/thread.h"
#include "httpp.h" #include "httpp/httpp.h"
#include "log.h"
#include "connection.h" #include "connection.h"
#include "refbuf.h" #include "refbuf.h"
......
#ifndef __LOGGING_H__ #ifndef __LOGGING_H__
#define __LOGGING_H__ #define __LOGGING_H__
#include "log.h" #include "log/log.h"
/* declare the global log descriptors */ /* declare the global log descriptors */
......
...@@ -2,12 +2,11 @@ ...@@ -2,12 +2,11 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "thread.h" #include "thread/thread.h"
#include "avl.h" #include "avl/avl.h"
#include "log.h" #include "net/sock.h"
#include "sock.h" #include "net/resolver.h"
#include "resolver.h" #include "httpp/httpp.h"
#include "httpp.h"
#ifdef CHUID #ifdef CHUID
#include <sys/types.h> #include <sys/types.h>
......
#include <signal.h> #include <signal.h>
#include "thread.h" #include "thread/thread.h"
#include "avl.h" #include "avl/avl.h"
#include "log.h" #include "httpp/httpp.h"
#include "httpp.h"
#include "global.h" #include "global.h"
#include "connection.h" #include "connection.h"
......
...@@ -25,11 +25,10 @@ ...@@ -25,11 +25,10 @@
#include "os.h" #include "os.h"
#include "thread.h" #include "thread/thread.h"
#include "avl.h" #include "avl/avl.h"
#include "sock.h" #include "net/sock.h"
#include "log.h" #include "httpp/httpp.h"
#include "httpp.h"
#include "config.h" #include "config.h"
#include "global.h" #include "global.h"
......
...@@ -15,17 +15,16 @@ ...@@ -15,17 +15,16 @@
#include <windows.h> #include <windows.h>
#endif #endif
#include "thread.h" #include "thread/thread.h"
#include "avl.h" #include "avl/avl.h"
#include "httpp.h" #include "httpp/httpp.h"
#include "sock.h" #include "net/sock.h"
#include "connection.h" #include "connection.h"
#include "global.h" #include "global.h"
#include "refbuf.h" #include "refbuf.h"
#include "client.h" #include "client.h"
#include "stats.h" #include "stats.h"
#include "log.h"
#include "logging.h" #include "logging.h"
#include "config.h" #include "config.h"
#include "util.h" #include "util.h"
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define __STATS_H__ #define __STATS_H__
#include "connection.h" #include "connection.h"
#include "httpp.h" #include "httpp/httpp.h"
#include "client.h" #include "client.h"
#include <libxml/xmlmemory.h> #include <libxml/xmlmemory.h>
#include <libxml/parser.h> #include <libxml/parser.h>
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#define strncasecmp strnicmp #define strncasecmp strnicmp
#endif #endif
#include "sock.h" #include "net/sock.h"
#include "config.h" #include "config.h"
#include "util.h" #include "util.h"
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#define CATMODULE "util" #define CATMODULE "util"
#include "log.h"
#include "logging.h" #include "logging.h"
/* Abstract out an interface to use either poll or select depending on which /* Abstract out an interface to use either poll or select depending on which
......
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
#endif #endif
#include <thread/thread.h> #include "thread/thread.h"
#include <avl/avl.h> #include "avl/avl.h"
#include <httpp/httpp.h> #include "httpp/httpp.h"
#include <net/sock.h> #include "net/sock.h"
#include "connection.h" #include "connection.h"
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "stats.h" #include "stats.h"
#define CATMODULE "xslt" #define CATMODULE "xslt"
#include "log.h"
#include "logging.h" #include "logging.h"
typedef struct { typedef struct {
......
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
#include <libxslt/xsltutils.h> #include <libxslt/xsltutils.h>
#include <thread/thread.h> #include "thread/thread.h"
#include <avl/avl.h> #include "avl/avl.h"
#include <httpp/httpp.h> #include "httpp/httpp.h"
#include <net/sock.h> #include "net/sock.h"
#include "connection.h" #include "connection.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment