aniani/icecast-common
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-common.git synced 2024-06-23 06:25:25 +00:00
Code

Fix: Corrected header includes

Browse Source
This commit is contained in:
Philipp Schafft 2018-11-02 11:20:04 +00:00
parent a94db086b8
commit 2621d4bb6e
24 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -28,5 +28,7 @@ libigloo_la_LIBADD = \
pkgconfig_DATA = igloo.pc pkgconfig_DATA = igloo.pc
AM_CFLAGS = -I$(top_srcdir)/include
static: static:
$(MAKE) all LDFLAGS="${LDFLAGS} -all-static" $(MAKE) all LDFLAGS="${LDFLAGS} -all-static"

2
avl/Makefile.am
View File

@ -8,7 +8,7 @@ noinst_LTLIBRARIES = libiceavl.la
libiceavl_la_SOURCES = avl.c libiceavl_la_SOURCES = avl.c
AM_CPPFLAGS = -I$(srcdir)/.. AM_CFLAGS = -I$(top_srcdir)/include
debug: debug:
$(MAKE) all CFLAGS="@DEBUG@" $(MAKE) all CFLAGS="@DEBUG@"

2
avl/avl.c
View File

@ -37,7 +37,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "../include/igloo/avl.h" #include <igloo/avl.h>
igloo_avl_node * igloo_avl_node *
igloo_avl_node_new (void * key, igloo_avl_node_new (void * key,

2
avl/test.c
View File

@ -1,5 +1,5 @@
#include <stdio.h> #include <stdio.h>
#include "../include/igloo/avl.h" #include <igloo/avl.h>
#ifdef _WIN32 #ifdef _WIN32
#define snprintf _snprintf #define snprintf _snprintf

3
httpp/Makefile.am
View File

@ -5,7 +5,8 @@ AUTOMAKE_OPTIONS = foreign
noinst_LTLIBRARIES = libicehttpp.la noinst_LTLIBRARIES = libicehttpp.la
libicehttpp_la_SOURCES = httpp.c encoding.c libicehttpp_la_SOURCES = httpp.c encoding.c
AM_CPPFLAGS = -I$(srcdir)/..
AM_CFLAGS = -I$(top_srcdir)/include
# SCCS stuff (for BitKeeper) # SCCS stuff (for BitKeeper)
GET = true GET = true

2
httpp/encoding.c
View File

@ -32,7 +32,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include "../include/igloo/encoding.h" #include <igloo/encoding.h>
struct igloo_httpp_encoding_tag { struct igloo_httpp_encoding_tag {
size_t refc; size_t refc;

4
httpp/httpp.c
View File

@ -38,8 +38,8 @@
#include <strings.h> #include <strings.h>
#endif #endif
#include "../include/igloo/avl.h" #include <igloo/avl.h>
#include "../include/igloo/httpp.h" #include <igloo/httpp.h>
#define MAX_HEADERS 32 #define MAX_HEADERS 32

2
httpp/test.c
View File

@ -1,7 +1,7 @@
#include <stdio.h> #include <stdio.h>
#include <avl/avl.h> #include <avl/avl.h>
#include "../include/igloo/httpp.h" #include <igloo/httpp.h>
int main(int argc, char **argv) int main(int argc, char **argv)

4
include/igloo/avl.h
View File

@ -12,11 +12,11 @@
extern "C" { extern "C" {
#endif #endif
#include "config.h" #include <igloo/config.h>
#define AVL_KEY_PRINTER_BUFLEN (256) #define AVL_KEY_PRINTER_BUFLEN (256)
#include "thread.h" #include <igloo/thread.h>
typedef struct igloo_avl_node_tag { typedef struct igloo_avl_node_tag {
void * key; void * key;

2
include/igloo/httpp.h
View File

@ -27,7 +27,7 @@
#ifndef _LIBIGLOO__HTTPP_H_ #ifndef _LIBIGLOO__HTTPP_H_
#define _LIBIGLOO__HTTPP_H_ #define _LIBIGLOO__HTTPP_H_
#include "avl.h" #include <igloo/avl.h>
#define igloo_HTTPP_VAR_PROTOCOL "__protocol" #define igloo_HTTPP_VAR_PROTOCOL "__protocol"
#define igloo_HTTPP_VAR_VERSION "__version" #define igloo_HTTPP_VAR_VERSION "__version"

2
include/igloo/sock.h
View File

@ -28,7 +28,7 @@
#ifndef _LIBIGLOO__SOCK_H_ #ifndef _LIBIGLOO__SOCK_H_
#define _LIBIGLOO__SOCK_H_ #define _LIBIGLOO__SOCK_H_
#include "config.h" #include <igloo/config.h>
#include <stdarg.h> #include <stdarg.h>

2
include/igloo/thread.h
View File

@ -27,7 +27,7 @@
#ifndef _LIBIGLOO__THREAD_H_ #ifndef _LIBIGLOO__THREAD_H_
#define _LIBIGLOO__THREAD_H_ #define _LIBIGLOO__THREAD_H_
#include "config.h" #include <igloo/config.h>
#include <pthread.h> #include <pthread.h>

2
include/igloo/timing.h
View File

@ -28,7 +28,7 @@
#ifndef _LIBIGLOO__TIMING_H_ #ifndef _LIBIGLOO__TIMING_H_
#define _LIBIGLOO__TIMING_H_ #define _LIBIGLOO__TIMING_H_
#include "config.h" #include <igloo/config.h>
#include <sys/types.h> #include <sys/types.h>
#ifdef IGLOO_CTC_HAVE_INTTYPES_H #ifdef IGLOO_CTC_HAVE_INTTYPES_H

2
log/Makefile.am
View File

@ -8,6 +8,8 @@ noinst_LTLIBRARIES = libicelog.la
libicelog_la_SOURCES = log.c libicelog_la_SOURCES = log.c
AM_CFLAGS = -I$(top_srcdir)/include
debug: debug:
$(MAKE) all CFLAGS="@DEBUG@" $(MAKE) all CFLAGS="@DEBUG@"

2
log/log.c
View File

@ -51,7 +51,7 @@
#include <windows.h> #include <windows.h>
#endif #endif
#include "../include/igloo/log.h" #include <igloo/log.h>
#define LOG_MAXLOGS 25 #define LOG_MAXLOGS 25
#define LOG_MAXLINELEN 1024 #define LOG_MAXLINELEN 1024

2
log/test.c
View File

@ -1,4 +1,4 @@
#include "../include/igloo/log.h" #include <igloo/log.h>
#define CATMODULE "test" #define CATMODULE "test"

2
net/Makefile.am
View File

@ -8,7 +8,7 @@ noinst_LTLIBRARIES = libicenet.la
libicenet_la_SOURCES = sock.c resolver.c libicenet_la_SOURCES = sock.c resolver.c
AM_CPPFLAGS = -I$(srcdir)/.. AM_CFLAGS = -I$(top_srcdir)/include
debug: debug:
$(MAKE) all CFLAGS="@DEBUG@" $(MAKE) all CFLAGS="@DEBUG@"

6
net/resolver.c
View File

@ -42,7 +42,7 @@
#endif #endif
#ifndef NO_THREAD #ifndef NO_THREAD
#include "../include/igloo/thread.h" #include <igloo/thread.h>
#else #else
#define igloo_thread_mutex_create(x) do{}while(0) #define igloo_thread_mutex_create(x) do{}while(0)
#define igloo_thread_mutex_destroy(x) do{}while(0) #define igloo_thread_mutex_destroy(x) do{}while(0)
@ -50,8 +50,8 @@
#define igloo_thread_mutex_unlock(x) do{}while(0) #define igloo_thread_mutex_unlock(x) do{}while(0)
#endif #endif
#include "../include/igloo/resolver.h" #include <igloo/resolver.h>
#include "../include/igloo/sock.h" #include <igloo/sock.h>
/* internal function */ /* internal function */

4
net/sock.c
View File

@ -56,8 +56,8 @@
#include <winsock2.h> #include <winsock2.h>
#endif #endif
#include "../include/igloo/sock.h" #include <igloo/sock.h>
#include "../include/igloo/resolver.h" #include <igloo/resolver.h>
/* for older C libraries */ /* for older C libraries */
#ifndef AI_NUMERICSERV #ifndef AI_NUMERICSERV

2
net/test_resolver.c
View File

@ -1,7 +1,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "../include/igloo/resolver.h" #include <igloo/resolver.h>
int main() int main()
{ {

2
thread/Makefile.am
View File

@ -8,7 +8,7 @@ noinst_LTLIBRARIES = libicethread.la
libicethread_la_SOURCES = thread.c libicethread_la_SOURCES = thread.c
AM_CPPFLAGS = -I$(srcdir)/.. AM_CFLAGS = -I$(top_srcdir)/include
debug: debug:
$(MAKE) all CFLAGS="@DEBUG@" $(MAKE) all CFLAGS="@DEBUG@"

6
thread/thread.c
View File

@ -47,10 +47,10 @@
#include <signal.h> #include <signal.h>
#include "../include/igloo/thread.h" #include <igloo/thread.h>
#include "../include/igloo/avl.h" #include <igloo/avl.h>
#ifdef THREAD_DEBUG #ifdef THREAD_DEBUG
#include "../include/igloo/log.h" #include <igloo/log.h>
#endif #endif
#ifdef _WIN32 #ifdef _WIN32

2
timing/Makefile.am
View File

@ -8,6 +8,8 @@ noinst_LTLIBRARIES = libicetiming.la
libicetiming_la_SOURCES = timing.c libicetiming_la_SOURCES = timing.c
AM_CFLAGS = -I$(top_srcdir)/include
debug: debug:
$(MAKE) all CFLAGS="@DEBUG@" $(MAKE) all CFLAGS="@DEBUG@"

2
timing/timing.c
View File

@ -59,7 +59,7 @@
#include <sys/timeb.h> #include <sys/timeb.h>
#endif #endif
#include "../include/igloo/timing.h" #include <igloo/timing.h>
/* /*
* Returns milliseconds no matter what. * Returns milliseconds no matter what.