From 43953202a2b7d8162d8370d44b55b286a98193ff Mon Sep 17 00:00:00 2001 From: Karl Heyes Date: Mon, 21 Jul 2003 01:58:54 +0000 Subject: [PATCH] refer to cfgfile.h instead of config.h for icecast.xml, and use config.h for autoconf svn path=/trunk/icecast/; revision=5156 --- src/admin.c | 6 +++++- src/client.c | 4 ++++ src/configtest.c | 6 +++++- src/connection.c | 6 +++++- src/event.c | 6 +++++- src/format.c | 4 ++++ src/format_mp3.c | 4 ++++ src/format_vorbis.c | 4 ++++ src/fserve.c | 6 +++++- src/geturl.c | 6 +++++- src/global.c | 4 ++++ src/logging.c | 6 +++++- src/main.c | 6 +++++- src/refbuf.c | 4 ++++ src/sighandler.c | 6 ++++-- src/slave.c | 6 +++++- src/source.c | 6 +++++- src/source.h | 2 +- src/stats.c | 4 ++++ src/util.c | 6 +++++- src/xslt.c | 4 ++++ src/yp.c | 6 +++++- 22 files changed, 97 insertions(+), 15 deletions(-) diff --git a/src/admin.c b/src/admin.c index 029cb89a..30e94b7c 100644 --- a/src/admin.c +++ b/src/admin.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include @@ -6,7 +10,7 @@ #include #include -#include "config.h" +#include "cfgfile.h" #include "connection.h" #include "refbuf.h" #include "client.h" diff --git a/src/client.c b/src/client.c index fa975312..a02c4c16 100644 --- a/src/client.c +++ b/src/client.c @@ -4,6 +4,10 @@ ** */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include diff --git a/src/configtest.c b/src/configtest.c index 864ed04f..decce1aa 100644 --- a/src/configtest.c +++ b/src/configtest.c @@ -1,5 +1,9 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + #include -#include "config.h" +#include "cfgfile.h" void _dump_config(ice_config_t *config); diff --git a/src/connection.c b/src/connection.c index d545860e..b74631c7 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,4 +1,8 @@ /* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include @@ -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" diff --git a/src/event.c b/src/event.c index ecba4d66..97f32a86 100644 --- a/src/event.c +++ b/src/event.c @@ -1,5 +1,9 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "event.h" -#include "config.h" +#include "cfgfile.h" #include "refbuf.h" #include "client.h" diff --git a/src/format.c b/src/format.c index 408f04e6..61c91309 100644 --- a/src/format.c +++ b/src/format.c @@ -5,6 +5,10 @@ ** */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include diff --git a/src/format_mp3.c b/src/format_mp3.c index 9039f711..c1750f05 100644 --- a/src/format_mp3.c +++ b/src/format_mp3.c @@ -5,6 +5,10 @@ ** */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include diff --git a/src/format_vorbis.c b/src/format_vorbis.c index b67b041e..263f1aca 100644 --- a/src/format_vorbis.c +++ b/src/format_vorbis.c @@ -4,6 +4,10 @@ ** */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include diff --git a/src/fserve.c b/src/fserve.c index 0996cbd3..57b4808f 100644 --- a/src/fserve.c +++ b/src/fserve.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include @@ -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" diff --git a/src/geturl.c b/src/geturl.c index bd84e6e9..91a4847d 100644 --- a/src/geturl.c +++ b/src/geturl.c @@ -1,4 +1,8 @@ /* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include @@ -12,7 +16,7 @@ #include "format.h" #include "geturl.h" #include "source.h" -#include "config.h" +#include "cfgfile.h" #include #include diff --git a/src/global.c b/src/global.c index 1129df42..63d7b605 100644 --- a/src/global.c +++ b/src/global.c @@ -1,4 +1,8 @@ /* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include "thread/thread.h" diff --git a/src/logging.c b/src/logging.c index 0d6b77d3..c38671ab 100644 --- a/src/logging.c +++ b/src/logging.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include @@ -10,7 +14,7 @@ #include "client.h" #include "os.h" -#include "config.h" +#include "cfgfile.h" #include "logging.h" #ifdef _WIN32 diff --git a/src/main.c b/src/main.c index bac9ed81..6797100b 100644 --- a/src/main.c +++ b/src/main.c @@ -1,4 +1,8 @@ /* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include @@ -15,7 +19,7 @@ #include #endif -#include "config.h" +#include "cfgfile.h" #include "sighandler.h" #include "global.h" diff --git a/src/refbuf.c b/src/refbuf.c index d11ed4a4..8a75f5a0 100644 --- a/src/refbuf.c +++ b/src/refbuf.c @@ -4,6 +4,10 @@ ** */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include diff --git a/src/sighandler.c b/src/sighandler.c index 319d31c1..87366577 100644 --- a/src/sighandler.c +++ b/src/sighandler.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include "thread/thread.h" @@ -46,8 +50,6 @@ void _sig_hup(int signo) 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); } diff --git a/src/slave.c b/src/slave.c index ed2820fc..f2b134a2 100644 --- a/src/slave.c +++ b/src/slave.c @@ -6,6 +6,10 @@ * and creates source threads for any it doesn't already have. * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include @@ -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" diff --git a/src/source.c b/src/source.c index 66bf07d7..58dda1af 100644 --- a/src/source.c +++ b/src/source.c @@ -1,4 +1,8 @@ /* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include @@ -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" diff --git a/src/source.h b/src/source.h index 40f5558a..82646f71 100644 --- a/src/source.h +++ b/src/source.h @@ -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" diff --git a/src/stats.c b/src/stats.c index 2df005d3..9030ba67 100644 --- a/src/stats.c +++ b/src/stats.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include diff --git a/src/util.c b/src/util.c index 67cacc3c..6939c52e 100644 --- a/src/util.c +++ b/src/util.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include @@ -21,7 +25,7 @@ #include "net/sock.h" -#include "config.h" +#include "cfgfile.h" #include "util.h" #include "os.h" #include "refbuf.h" diff --git a/src/xslt.c b/src/xslt.c index 33acf1c4..20688a93 100644 --- a/src/xslt.c +++ b/src/xslt.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include diff --git a/src/yp.c b/src/yp.c index ce2fd9c4..23e38c7e 100644 --- a/src/yp.c +++ b/src/yp.c @@ -1,4 +1,8 @@ /* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include @@ -12,7 +16,7 @@ #include "format.h" #include "geturl.h" #include "source.h" -#include "config.h" +#include "cfgfile.h" #define CATMODULE "yp"