Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
Icecast-Server
Commits
508d2564
Commit
508d2564
authored
Jul 16, 2003
by
Karl Heyes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avoid header namespace clashes
svn path=/trunk/icecast/; revision=5146
parent
62ce258d
Changes
20
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
49 additions
and
63 deletions
+49
-63
src/Makefile.am
src/Makefile.am
+0
-3
src/client.c
src/client.c
+3
-3
src/connection.c
src/connection.c
+4
-5
src/connection.h
src/connection.h
+3
-3
src/format.c
src/format.c
+1
-2
src/format.h
src/format.h
+1
-1
src/format_mp3.c
src/format_mp3.c
+0
-1
src/format_vorbis.c
src/format_vorbis.c
+0
-1
src/fserve.c
src/fserve.c
+4
-5
src/global.c
src/global.c
+3
-3
src/logging.c
src/logging.c
+2
-3
src/logging.h
src/logging.h
+1
-1
src/main.c
src/main.c
+5
-6
src/sighandler.c
src/sighandler.c
+3
-4
src/slave.c
src/slave.c
+4
-5
src/source.c
src/source.c
+4
-5
src/stats.h
src/stats.h
+1
-1
src/util.c
src/util.c
+1
-2
src/xslt.c
src/xslt.c
+5
-5
src/xslt.h
src/xslt.h
+4
-4
No files found.
src/Makefile.am
View file @
508d2564
...
...
@@ -21,9 +21,6 @@ icecast_DEPENDENCIES = $(icecast_LDADD)
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@"
...
...
src/client.c
View file @
508d2564
...
...
@@ -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"
...
...
src/connection.c
View file @
508d2564
...
...
@@ -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"
...
...
src/connection.h
View file @
508d2564
...
...
@@ -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
;
...
...
src/format.c
View file @
508d2564
...
...
@@ -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"
...
...
src/format.h
View file @
508d2564
...
...
@@ -8,7 +8,7 @@
#include "client.h"
#include "refbuf.h"
#include "httpp.h"
#include "httpp
/httpp
.h"
struct
source_tag
;
...
...
src/format_mp3.c
View file @
508d2564
...
...
@@ -17,7 +17,6 @@
#include "format.h"
#include "httpp/httpp.h"
#include "log.h"
#include "logging.h"
#include "format_mp3.h"
...
...
src/format_vorbis.c
View file @
508d2564
...
...
@@ -19,7 +19,6 @@
#include "format.h"
#define CATMODULE "format-vorbis"
#include "log.h"
#include "logging.h"
#define MAX_HEADER_PAGES 10
...
...
src/fserve.c
View file @
508d2564
...
...
@@ -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"
...
...
src/global.c
View file @
508d2564
/* -*- 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"
...
...
src/logging.c
View file @
508d2564
...
...
@@ -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"
...
...
src/logging.h
View file @
508d2564
#ifndef __LOGGING_H__
#define __LOGGING_H__
#include "log.h"
#include "log
/log
.h"
/* declare the global log descriptors */
...
...
src/main.c
View file @
508d2564
...
...
@@ -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>
...
...
src/sighandler.c
View file @
508d2564
#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"
...
...
src/slave.c
View file @
508d2564
...
...
@@ -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"
...
...
src/source.c
View file @
508d2564
...
...
@@ -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"
...
...
src/stats.h
View file @
508d2564
...
...
@@ -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>
...
...
src/util.c
View file @
508d2564
...
...
@@ -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
...
...
src/xslt.c
View file @
508d2564
...
...
@@ -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
{
...
...
src/xslt.h
View file @
508d2564
...
...
@@ -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"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment