[xiph-cvs] cvs commit: icecast/src admin.c client.c configtest.c connection.c event.c format.c format_mp3.c format_vorbis.c fserve.c geturl.c global.c logging.c main.c refbuf.c sighandler.c slave.c source.c stats.c util.c xslt.c yp.c source.h
Karl Heyes
karl at xiph.org
Sun Jul 20 18:58:55 PDT 2003
karl 03/07/20 21:58:55
Modified: src admin.c client.c configtest.c connection.c event.c
format.c format_mp3.c format_vorbis.c fserve.c
geturl.c global.c logging.c main.c refbuf.c
sighandler.c slave.c source.c stats.c util.c xslt.c
yp.c source.h
Log:
refer to cfgfile.h instead of config.h for icecast.xml, and use config.h
for autoconf
Revision Changes Path
1.13 +5 -1 icecast/src/admin.c
Index: admin.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/admin.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- admin.c 26 Jun 2003 13:31:17 -0000 1.12
+++ admin.c 21 Jul 2003 01:58:54 -0000 1.13
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <string.h>
#include <stdlib.h>
#include <stdarg.h>
@@ -6,7 +10,7 @@
#include <libxml/parser.h>
#include <libxml/tree.h>
-#include "config.h"
+#include "cfgfile.h"
#include "connection.h"
#include "refbuf.h"
#include "client.h"
<p><p>1.10 +4 -0 icecast/src/client.c
Index: client.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/client.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- client.c 16 Jul 2003 19:41:59 -0000 1.9
+++ client.c 21 Jul 2003 01:58:54 -0000 1.10
@@ -4,6 +4,10 @@
**
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdlib.h>
#include <string.h>
<p><p>1.6 +5 -1 icecast/src/configtest.c
Index: configtest.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/configtest.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- configtest.c 15 Mar 2003 02:10:17 -0000 1.5
+++ configtest.c 21 Jul 2003 01:58:54 -0000 1.6
@@ -1,5 +1,9 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
-#include "config.h"
+#include "cfgfile.h"
void _dump_config(ice_config_t *config);
<p><p>1.75 +5 -1 icecast/src/connection.c
Index: connection.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/connection.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- connection.c 16 Jul 2003 19:41:59 -0000 1.74
+++ connection.c 21 Jul 2003 01:58:54 -0000 1.75
@@ -1,4 +1,8 @@
/* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -27,7 +31,7 @@
#include "net/sock.h"
#include "httpp/httpp.h"
-#include "config.h"
+#include "cfgfile.h"
#include "global.h"
#include "util.h"
#include "connection.h"
<p><p>1.4 +5 -1 icecast/src/event.c
Index: event.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/event.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- event.c 11 Jul 2003 23:54:50 -0000 1.3
+++ event.c 21 Jul 2003 01:58:54 -0000 1.4
@@ -1,5 +1,9 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "event.h"
-#include "config.h"
+#include "cfgfile.h"
#include "refbuf.h"
#include "client.h"
<p><p>1.25 +4 -0 icecast/src/format.c
Index: format.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/format.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- format.c 16 Jul 2003 19:41:59 -0000 1.24
+++ format.c 21 Jul 2003 01:58:54 -0000 1.25
@@ -5,6 +5,10 @@
**
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdlib.h>
#include <string.h>
#include <time.h>
<p><p>1.22 +4 -0 icecast/src/format_mp3.c
Index: format_mp3.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/format_mp3.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- format_mp3.c 16 Jul 2003 19:41:59 -0000 1.21
+++ format_mp3.c 21 Jul 2003 01:58:54 -0000 1.22
@@ -5,6 +5,10 @@
**
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
<p><p>1.15 +4 -0 icecast/src/format_vorbis.c
Index: format_vorbis.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/format_vorbis.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- format_vorbis.c 16 Jul 2003 19:41:59 -0000 1.14
+++ format_vorbis.c 21 Jul 2003 01:58:54 -0000 1.15
@@ -4,6 +4,10 @@
**
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
<p><p>1.14 +5 -1 icecast/src/fserve.c
Index: fserve.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/fserve.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fserve.c 16 Jul 2003 19:41:59 -0000 1.13
+++ fserve.c 21 Jul 2003 01:58:54 -0000 1.14
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -28,7 +32,7 @@
#include "stats.h"
#include "format.h"
#include "logging.h"
-#include "config.h"
+#include "cfgfile.h"
#include "util.h"
#include "fserve.h"
<p><p>1.5 +5 -1 icecast/src/geturl.c
Index: geturl.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/geturl.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- geturl.c 27 Mar 2003 17:09:45 -0000 1.4
+++ geturl.c 21 Jul 2003 01:58:54 -0000 1.5
@@ -1,4 +1,8 @@
/* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -12,7 +16,7 @@
#include "format.h"
#include "geturl.h"
#include "source.h"
-#include "config.h"
+#include "cfgfile.h"
#include <curl/curl.h>
#include <curl/types.h>
<p><p>1.10 +4 -0 icecast/src/global.c
Index: global.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/global.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- global.c 16 Jul 2003 19:41:59 -0000 1.9
+++ global.c 21 Jul 2003 01:58:54 -0000 1.10
@@ -1,4 +1,8 @@
/* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <string.h>
#include "thread/thread.h"
<p><p>1.7 +5 -1 icecast/src/logging.c
Index: logging.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/logging.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- logging.c 16 Jul 2003 19:41:59 -0000 1.6
+++ logging.c 21 Jul 2003 01:58:54 -0000 1.7
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <time.h>
#include <string.h>
@@ -10,7 +14,7 @@
#include "client.h"
#include "os.h"
-#include "config.h"
+#include "cfgfile.h"
#include "logging.h"
#ifdef _WIN32
<p><p>1.30 +5 -1 icecast/src/main.c
Index: main.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/main.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- main.c 16 Jul 2003 19:41:59 -0000 1.29
+++ main.c 21 Jul 2003 01:58:54 -0000 1.30
@@ -1,4 +1,8 @@
/* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <string.h>
@@ -15,7 +19,7 @@
#include <errno.h>
#endif
-#include "config.h"
+#include "cfgfile.h"
#include "sighandler.h"
#include "global.h"
<p><p>1.8 +4 -0 icecast/src/refbuf.c
Index: refbuf.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/refbuf.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- refbuf.c 30 Mar 2003 13:52:27 -0000 1.7
+++ refbuf.c 21 Jul 2003 01:58:54 -0000 1.8
@@ -4,6 +4,10 @@
**
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdlib.h>
#include <string.h>
<p><p>1.6 +4 -2 icecast/src/sighandler.c
Index: sighandler.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/sighandler.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sighandler.c 16 Jul 2003 19:41:59 -0000 1.5
+++ sighandler.c 21 Jul 2003 01:58:54 -0000 1.6
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <signal.h>
#include "thread/thread.h"
@@ -46,8 +50,6 @@
connection_inject_event(EVENT_CONFIG_READ, NULL);
- /* reopen logfiles (TODO: We don't do this currently) */
-
/* some OSes require us to reattach the signal handler */
signal(SIGHUP, _sig_hup);
}
<p><p>1.27 +5 -1 icecast/src/slave.c
Index: slave.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/slave.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- slave.c 16 Jul 2003 19:41:59 -0000 1.26
+++ slave.c 21 Jul 2003 01:58:54 -0000 1.27
@@ -6,6 +6,10 @@
* and creates source threads for any it doesn't already have.
* */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -30,7 +34,7 @@
#include "net/sock.h"
#include "httpp/httpp.h"
-#include "config.h"
+#include "cfgfile.h"
#include "global.h"
#include "util.h"
#include "connection.h"
<p><p>1.58 +5 -1 icecast/src/source.c
Index: source.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/source.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- source.c 16 Jul 2003 19:41:59 -0000 1.57
+++ source.c 21 Jul 2003 01:58:54 -0000 1.58
@@ -1,4 +1,8 @@
/* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -26,7 +30,7 @@
#include "client.h"
#include "stats.h"
#include "logging.h"
-#include "config.h"
+#include "cfgfile.h"
#include "util.h"
#ifdef USE_YP
#include "geturl.h"
<p><p>1.27 +4 -0 icecast/src/stats.c
Index: stats.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/stats.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- stats.c 26 Jun 2003 13:32:34 -0000 1.26
+++ stats.c 21 Jul 2003 01:58:54 -0000 1.27
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
<p><p>1.25 +5 -1 icecast/src/util.c
Index: util.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/util.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- util.c 16 Jul 2003 19:41:59 -0000 1.24
+++ util.c 21 Jul 2003 01:58:54 -0000 1.25
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <sys/types.h>
#include <stdio.h>
#include <string.h>
@@ -21,7 +25,7 @@
#include "net/sock.h"
-#include "config.h"
+#include "cfgfile.h"
#include "util.h"
#include "os.h"
#include "refbuf.h"
<p><p>1.10 +4 -0 icecast/src/xslt.c
Index: xslt.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/xslt.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xslt.c 16 Jul 2003 19:41:59 -0000 1.9
+++ xslt.c 21 Jul 2003 01:58:54 -0000 1.10
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <string.h>
#include <libxml/xmlmemory.h>
#include <libxml/debugXML.h>
<p><p>1.12 +5 -1 icecast/src/yp.c
Index: yp.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/yp.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- yp.c 8 Jul 2003 14:11:01 -0000 1.11
+++ yp.c 21 Jul 2003 01:58:54 -0000 1.12
@@ -1,4 +1,8 @@
/* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -12,7 +16,7 @@
#include "format.h"
#include "geturl.h"
#include "source.h"
-#include "config.h"
+#include "cfgfile.h"
#define CATMODULE "yp"
<p><p>1.15 +1 -1 icecast/src/source.h
Index: source.h
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/source.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- source.h 26 Jun 2003 13:32:04 -0000 1.14
+++ source.h 21 Jul 2003 01:58:54 -0000 1.15
@@ -1,7 +1,7 @@
#ifndef __SOURCE_H__
#define __SOURCE_H__
-#include "config.h"
+#include "cfgfile.h"
#include "yp.h"
#include "util.h"
#include "format.h"
<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