[xiph-cvs] cvs commit: icecast/src client.c connection.c format.c format_mp3.c format_vorbis.c fserve.c global.c logging.c main.c sighandler.c slave.c source.c util.c xslt.c connection.h format.h logging.h stats.h xslt.h Makefile.am
Karl Heyes
karl at xiph.org
Wed Jul 16 12:42:00 PDT 2003
karl 03/07/16 15:42:00
Modified: src client.c connection.c format.c format_mp3.c
format_vorbis.c fserve.c global.c logging.c main.c
sighandler.c slave.c source.c util.c xslt.c
connection.h format.h logging.h stats.h xslt.h
Makefile.am
Log:
avoid header namespace clashes
Revision Changes Path
1.9 +3 -3 icecast/src/client.c
Index: client.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/client.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- client.c 15 Mar 2003 02:10:17 -0000 1.8
+++ client.c 16 Jul 2003 19:41:59 -0000 1.9
@@ -7,9 +7,9 @@
#include <stdlib.h>
#include <string.h>
-#include "thread.h"
-#include "avl.h"
-#include "httpp.h"
+#include "thread/thread.h"
+#include "avl/avl.h"
+#include "httpp/httpp.h"
#include "connection.h"
#include "refbuf.h"
<p><p>1.74 +4 -5 icecast/src/connection.c
Index: connection.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/connection.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- connection.c 5 Jul 2003 06:36:16 -0000 1.73
+++ connection.c 16 Jul 2003 19:41:59 -0000 1.74
@@ -22,11 +22,10 @@
#include "os.h"
-#include "thread.h"
-#include "avl.h"
-#include "sock.h"
-#include "log.h"
-#include "httpp.h"
+#include "thread/thread.h"
+#include "avl/avl.h"
+#include "net/sock.h"
+#include "httpp/httpp.h"
#include "config.h"
#include "global.h"
<p><p>1.24 +1 -2 icecast/src/format.c
Index: format.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/format.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- format.c 6 Jul 2003 15:27:50 -0000 1.23
+++ format.c 16 Jul 2003 19:41:59 -0000 1.24
@@ -15,12 +15,11 @@
#include "source.h"
#include "format.h"
#include "global.h"
-#include "httpp.h"
+#include "httpp/httpp.h"
#include "format_vorbis.h"
#include "format_mp3.h"
-#include "log.h"
#include "logging.h"
#define CATMODULE "format"
<p><p>1.21 +0 -1 icecast/src/format_mp3.c
Index: format_mp3.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/format_mp3.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- format_mp3.c 7 Jul 2003 22:04:29 -0000 1.20
+++ format_mp3.c 16 Jul 2003 19:41:59 -0000 1.21
@@ -17,7 +17,6 @@
#include "format.h"
#include "httpp/httpp.h"
-#include "log.h"
#include "logging.h"
#include "format_mp3.h"
<p><p>1.14 +0 -1 icecast/src/format_vorbis.c
Index: format_vorbis.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/format_vorbis.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- format_vorbis.c 26 Jun 2003 13:31:38 -0000 1.13
+++ format_vorbis.c 16 Jul 2003 19:41:59 -0000 1.14
@@ -19,7 +19,6 @@
#include "format.h"
#define CATMODULE "format-vorbis"
-#include "log.h"
#include "logging.h"
#define MAX_HEADER_PAGES 10
<p><p>1.13 +4 -5 icecast/src/fserve.c
Index: fserve.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/fserve.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fserve.c 15 Mar 2003 02:10:17 -0000 1.12
+++ fserve.c 16 Jul 2003 19:41:59 -0000 1.13
@@ -16,10 +16,10 @@
#include <windows.h>
#endif
-#include "thread.h"
-#include "avl.h"
-#include "httpp.h"
-#include "sock.h"
+#include "thread/thread.h"
+#include "avl/avl.h"
+#include "httpp/httpp.h"
+#include "net/sock.h"
#include "connection.h"
#include "global.h"
@@ -27,7 +27,6 @@
#include "client.h"
#include "stats.h"
#include "format.h"
-#include "log.h"
#include "logging.h"
#include "config.h"
#include "util.h"
<p><p>1.9 +3 -3 icecast/src/global.c
Index: global.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/global.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- global.c 27 Mar 2003 17:09:53 -0000 1.8
+++ global.c 16 Jul 2003 19:41:59 -0000 1.9
@@ -1,10 +1,10 @@
/* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- */
#include <string.h>
-#include "thread.h"
-#include "avl.h"
+#include "thread/thread.h"
+#include "avl/avl.h"
+#include "httpp/httpp.h"
-#include "httpp.h"
#include "connection.h"
#include "refbuf.h"
#include "client.h"
<p><p>1.6 +2 -3 icecast/src/logging.c
Index: logging.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/logging.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- logging.c 11 Jul 2003 23:54:50 -0000 1.5
+++ logging.c 16 Jul 2003 19:41:59 -0000 1.6
@@ -2,9 +2,8 @@
#include <time.h>
#include <string.h>
-#include "thread.h"
-#include "httpp.h"
-#include "log.h"
+#include "thread/thread.h"
+#include "httpp/httpp.h"
#include "connection.h"
#include "refbuf.h"
<p><p>1.29 +5 -6 icecast/src/main.c
Index: main.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/main.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- main.c 26 Jun 2003 13:33:15 -0000 1.28
+++ main.c 16 Jul 2003 19:41:59 -0000 1.29
@@ -2,12 +2,11 @@
#include <stdio.h>
#include <string.h>
-#include "thread.h"
-#include "avl.h"
-#include "log.h"
-#include "sock.h"
-#include "resolver.h"
-#include "httpp.h"
+#include "thread/thread.h"
+#include "avl/avl.h"
+#include "net/sock.h"
+#include "net/resolver.h"
+#include "httpp/httpp.h"
#ifdef CHUID
#include <sys/types.h>
<p><p>1.5 +3 -4 icecast/src/sighandler.c
Index: sighandler.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/sighandler.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sighandler.c 15 Mar 2003 02:10:17 -0000 1.4
+++ sighandler.c 16 Jul 2003 19:41:59 -0000 1.5
@@ -1,9 +1,8 @@
#include <signal.h>
-#include "thread.h"
-#include "avl.h"
-#include "log.h"
-#include "httpp.h"
+#include "thread/thread.h"
+#include "avl/avl.h"
+#include "httpp/httpp.h"
#include "global.h"
#include "connection.h"
<p><p>1.26 +4 -5 icecast/src/slave.c
Index: slave.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/slave.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- slave.c 23 Apr 2003 12:44:29 -0000 1.25
+++ slave.c 16 Jul 2003 19:41:59 -0000 1.26
@@ -25,11 +25,10 @@
#include "os.h"
-#include "thread.h"
-#include "avl.h"
-#include "sock.h"
-#include "log.h"
-#include "httpp.h"
+#include "thread/thread.h"
+#include "avl/avl.h"
+#include "net/sock.h"
+#include "httpp/httpp.h"
#include "config.h"
#include "global.h"
<p><p>1.57 +4 -5 icecast/src/source.c
Index: source.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/source.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- source.c 11 Jul 2003 19:03:30 -0000 1.56
+++ source.c 16 Jul 2003 19:41:59 -0000 1.57
@@ -15,17 +15,16 @@
#include <windows.h>
#endif
-#include "thread.h"
-#include "avl.h"
-#include "httpp.h"
-#include "sock.h"
+#include "thread/thread.h"
+#include "avl/avl.h"
+#include "httpp/httpp.h"
+#include "net/sock.h"
#include "connection.h"
#include "global.h"
#include "refbuf.h"
#include "client.h"
#include "stats.h"
-#include "log.h"
#include "logging.h"
#include "config.h"
#include "util.h"
<p><p>1.24 +1 -2 icecast/src/util.c
Index: util.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/util.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- util.c 11 Apr 2003 03:00:24 -0000 1.23
+++ util.c 16 Jul 2003 19:41:59 -0000 1.24
@@ -19,7 +19,7 @@
#define strncasecmp strnicmp
#endif
-#include "sock.h"
+#include "net/sock.h"
#include "config.h"
#include "util.h"
@@ -30,7 +30,6 @@
#define CATMODULE "util"
-#include "log.h"
#include "logging.h"
/* Abstract out an interface to use either poll or select depending on which
<p><p>1.9 +5 -5 icecast/src/xslt.c
Index: xslt.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/xslt.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xslt.c 15 Mar 2003 02:10:17 -0000 1.8
+++ xslt.c 16 Jul 2003 19:41:59 -0000 1.9
@@ -20,10 +20,10 @@
#endif
-#include <thread/thread.h>
-#include <avl/avl.h>
-#include <httpp/httpp.h>
-#include <net/sock.h>
+#include "thread/thread.h"
+#include "avl/avl.h"
+#include "httpp/httpp.h"
+#include "net/sock.h"
#include "connection.h"
@@ -33,7 +33,7 @@
#include "stats.h"
#define CATMODULE "xslt"
-#include "log.h"
+
#include "logging.h"
typedef struct {
<p><p>1.11 +3 -3 icecast/src/connection.h
Index: connection.h
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/connection.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- connection.h 23 Apr 2003 12:44:29 -0000 1.10
+++ connection.h 16 Jul 2003 19:41:59 -0000 1.11
@@ -3,9 +3,9 @@
#include <sys/types.h>
#include "compat.h"
-#include "httpp.h"
-#include "thread.h"
-#include "sock.h"
+#include "httpp/httpp.h"
+#include "thread/thread.h"
+#include "net/sock.h"
struct _client_tag;
<p><p>1.13 +1 -1 icecast/src/format.h
Index: format.h
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/format.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- format.h 15 Mar 2003 02:10:17 -0000 1.12
+++ format.h 16 Jul 2003 19:41:59 -0000 1.13
@@ -8,7 +8,7 @@
#include "client.h"
#include "refbuf.h"
-#include "httpp.h"
+#include "httpp/httpp.h"
struct source_tag;
<p><p>1.8 +1 -1 icecast/src/logging.h
Index: logging.h
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/logging.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- logging.h 11 Jul 2003 23:54:50 -0000 1.7
+++ logging.h 16 Jul 2003 19:41:59 -0000 1.8
@@ -1,7 +1,7 @@
#ifndef __LOGGING_H__
#define __LOGGING_H__
-#include "log.h"
+#include "log/log.h"
/* declare the global log descriptors */
<p><p>1.7 +1 -1 icecast/src/stats.h
Index: stats.h
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/stats.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- stats.h 15 Mar 2003 02:10:17 -0000 1.6
+++ stats.h 16 Jul 2003 19:41:59 -0000 1.7
@@ -2,7 +2,7 @@
#define __STATS_H__
#include "connection.h"
-#include "httpp.h"
+#include "httpp/httpp.h"
#include "client.h"
#include <libxml/xmlmemory.h>
#include <libxml/parser.h>
<p><p>1.4 +4 -4 icecast/src/xslt.h
Index: xslt.h
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/xslt.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xslt.h 13 Aug 2002 12:46:45 -0000 1.3
+++ xslt.h 16 Jul 2003 19:41:59 -0000 1.4
@@ -8,10 +8,10 @@
#include <libxslt/xsltutils.h>
-#include <thread/thread.h>
-#include <avl/avl.h>
-#include <httpp/httpp.h>
-#include <net/sock.h>
+#include "thread/thread.h"
+#include "avl/avl.h"
+#include "httpp/httpp.h"
+#include "net/sock.h"
#include "connection.h"
<p><p>1.17 +0 -3 icecast/src/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile.am 17 Apr 2003 01:03:32 -0000 1.16
+++ Makefile.am 16 Jul 2003 19:41:59 -0000 1.17
@@ -21,9 +21,6 @@
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@
-INCLUDES = -I$(srcdir)/net -I$(srcdir)/thread -I$(srcdir)/avl -I$(srcdir)/httpp \
- -I$(srcdir)/log -I$(srcdir)/timing
-
debug:
$(MAKE) all CFLAGS="@DEBUG@ @XML_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@"
<p><p>--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list