summaryrefslogtreecommitdiff
path: root/src/xine-utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/xine-utils')
-rw-r--r--src/xine-utils/array.c4
-rw-r--r--src/xine-utils/color.c2
-rw-r--r--src/xine-utils/copy.c2
-rw-r--r--src/xine-utils/cpu_accel.c2
-rw-r--r--src/xine-utils/crc.c2
-rw-r--r--src/xine-utils/list.c4
-rw-r--r--src/xine-utils/memcpy.c2
-rw-r--r--src/xine-utils/monitor.c2
-rw-r--r--src/xine-utils/pool.c6
-rw-r--r--src/xine-utils/ring_buffer.c8
-rw-r--r--src/xine-utils/sorted_array.c4
-rw-r--r--src/xine-utils/utils.c6
-rw-r--r--src/xine-utils/xine_buffer.c2
-rw-r--r--src/xine-utils/xine_check.c2
-rw-r--r--src/xine-utils/xine_check.h6
-rw-r--r--src/xine-utils/xine_mutex.c2
-rw-r--r--src/xine-utils/xmllexer.c4
-rw-r--r--src/xine-utils/xmlparser.c6
18 files changed, 31 insertions, 35 deletions
diff --git a/src/xine-utils/array.c b/src/xine-utils/array.c
index f6989fbb6..0db45be0c 100644
--- a/src/xine-utils/array.c
+++ b/src/xine-utils/array.c
@@ -23,8 +23,8 @@
#include <stdlib.h>
#include <string.h>
-#include "attributes.h"
-#include "array.h"
+#include <xine/attributes.h>
+#include <xine/array.h>
#define MIN_CHUNK_SIZE 32
diff --git a/src/xine-utils/color.c b/src/xine-utils/color.c
index 0b9cf0188..dc2c7e5e5 100644
--- a/src/xine-utils/color.c
+++ b/src/xine-utils/color.c
@@ -62,7 +62,7 @@
* instructions.
*/
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
/*
* In search of the perfect colorspace conversion formulae...
diff --git a/src/xine-utils/copy.c b/src/xine-utils/copy.c
index ed42b3a88..500b6db73 100644
--- a/src/xine-utils/copy.c
+++ b/src/xine-utils/copy.c
@@ -25,7 +25,7 @@
#include "config.h"
#endif
-#include "xineutils.h"
+#include <xine/xineutils.h>
void yv12_to_yv12
(const unsigned char *y_src, int y_src_pitch, unsigned char *y_dst, int y_dst_pitch,
diff --git a/src/xine-utils/cpu_accel.c b/src/xine-utils/cpu_accel.c
index 8bad23db9..07978b55f 100644
--- a/src/xine-utils/cpu_accel.c
+++ b/src/xine-utils/cpu_accel.c
@@ -39,7 +39,7 @@
#define LOG
*/
-#include "xineutils.h"
+#include <xine/xineutils.h>
#if defined(__i386__) || defined(__x86_64__)
diff --git a/src/xine-utils/crc.c b/src/xine-utils/crc.c
index ba0e3010b..4f720e9cc 100644
--- a/src/xine-utils/crc.c
+++ b/src/xine-utils/crc.c
@@ -20,7 +20,7 @@
* Common CRC calculation code.
*/
-#include "xineutils.h"
+#include <xine/xineutils.h>
static const uint32_t crc32_table[256] = {
0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9,
diff --git a/src/xine-utils/list.c b/src/xine-utils/list.c
index 65bdaec26..7a2b521bd 100644
--- a/src/xine-utils/list.c
+++ b/src/xine-utils/list.c
@@ -23,8 +23,8 @@
#endif
#include <stdlib.h>
-#include "attributes.h"
-#include "list.h"
+#include <xine/attributes.h>
+#include <xine/list.h>
#define MIN_CHUNK_SIZE 32
#define MAX_CHUNK_SIZE 65536
diff --git a/src/xine-utils/memcpy.c b/src/xine-utils/memcpy.c
index da4b83b09..15b0b228b 100644
--- a/src/xine-utils/memcpy.c
+++ b/src/xine-utils/memcpy.c
@@ -50,7 +50,7 @@
#define LOG
*/
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
void *(* xine_fast_memcpy)(void *to, const void *from, size_t len);
diff --git a/src/xine-utils/monitor.c b/src/xine-utils/monitor.c
index 3c7c3e10a..8cbfdaa72 100644
--- a/src/xine-utils/monitor.c
+++ b/src/xine-utils/monitor.c
@@ -26,7 +26,7 @@
#include <stdio.h>
#include <sys/time.h>
-#include "xineutils.h"
+#include <xine/xineutils.h>
#define MAX_ID 10
diff --git a/src/xine-utils/pool.c b/src/xine-utils/pool.c
index a1fddadd9..60330ef53 100644
--- a/src/xine-utils/pool.c
+++ b/src/xine-utils/pool.c
@@ -22,9 +22,9 @@
#endif
#include <assert.h>
-#include "attributes.h"
-#include "pool.h"
-#include "array.h"
+#include <xine/attributes.h>
+#include <xine/pool.h>
+#include <xine/array.h>
#define MIN_CHUNK_SIZE 32
#define MAX_CHUNK_SIZE 65536
diff --git a/src/xine-utils/ring_buffer.c b/src/xine-utils/ring_buffer.c
index 031fda4fc..7042eaa68 100644
--- a/src/xine-utils/ring_buffer.c
+++ b/src/xine-utils/ring_buffer.c
@@ -27,10 +27,10 @@
#include <assert.h>
#include <stdio.h>
#include <string.h>
-#include "attributes.h"
-#include "pool.h"
-#include "list.h"
-#include "ring_buffer.h"
+#include <xine/attributes.h>
+#include <xine/pool.h>
+#include <xine/list.h>
+#include <xine/ring_buffer.h>
#define RING_BUFFER_EXTRA_BUFFER_SIZE (1024 * 8)
diff --git a/src/xine-utils/sorted_array.c b/src/xine-utils/sorted_array.c
index 363325f0b..9dbe1fd0e 100644
--- a/src/xine-utils/sorted_array.c
+++ b/src/xine-utils/sorted_array.c
@@ -23,8 +23,8 @@
#include <stdlib.h>
#include <string.h>
-#include "attributes.h"
-#include "sorted_array.h"
+#include <xine/attributes.h>
+#include <xine/sorted_array.h>
/* Array internal struct */
struct xine_sarray_s {
diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c
index d9eb7fb3f..5aff537b4 100644
--- a/src/xine-utils/utils.c
+++ b/src/xine-utils/utils.c
@@ -27,10 +27,10 @@
#include "config.h"
#endif
-#include "xineutils.h"
-#include "xineintl.h"
+#include <xine/xineutils.h>
+#include <xine/xineintl.h>
#ifdef _MSC_VER
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
#endif
#include <errno.h>
diff --git a/src/xine-utils/xine_buffer.c b/src/xine-utils/xine_buffer.c
index 190ab5197..3891aec11 100644
--- a/src/xine-utils/xine_buffer.c
+++ b/src/xine-utils/xine_buffer.c
@@ -58,7 +58,7 @@
#define LOG
*/
-#include "xineutils.h"
+#include <xine/xineutils.h>
#define CHECKS
diff --git a/src/xine-utils/xine_check.c b/src/xine-utils/xine_check.c
index f00a23832..e850f9f48 100644
--- a/src/xine-utils/xine_check.c
+++ b/src/xine-utils/xine_check.c
@@ -45,7 +45,7 @@
#include <unistd.h>
#include "xine_check.h"
-#include "xineutils.h"
+#include <xine/xineutils.h>
#if defined(__linux__)
diff --git a/src/xine-utils/xine_check.h b/src/xine-utils/xine_check.h
index 4b21bf74e..75eda102d 100644
--- a/src/xine-utils/xine_check.h
+++ b/src/xine-utils/xine_check.h
@@ -2,11 +2,7 @@
#define XINE_CHECK_H
#include <stdio.h>
-#ifdef XINE_COMPILE
-# include "xine.h"
-#else
-# include <xine.h>
-#endif
+#include <xine.h>
/*
* Start checking xine setup here
diff --git a/src/xine-utils/xine_mutex.c b/src/xine-utils/xine_mutex.c
index c94f32be0..52d17d8e5 100644
--- a/src/xine-utils/xine_mutex.c
+++ b/src/xine-utils/xine_mutex.c
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <pthread.h>
-#include "xineutils.h"
+#include <xine/xineutils.h>
/*
#define DBG_MUTEX
diff --git a/src/xine-utils/xmllexer.c b/src/xine-utils/xmllexer.c
index bb03e5a79..e276beef0 100644
--- a/src/xine-utils/xmllexer.c
+++ b/src/xine-utils/xmllexer.c
@@ -26,12 +26,12 @@
*/
#ifdef XINE_COMPILE
-#include "xineutils.h"
+#include <xine/xineutils.h>
#else
#define lprintf(...)
#define xine_xmalloc malloc
#endif
-#include "xmllexer.h"
+#include <xine/xmllexer.h>
#include <stdio.h>
#include <ctype.h>
#include <string.h>
diff --git a/src/xine-utils/xmlparser.c b/src/xine-utils/xmlparser.c
index a7bc146a9..1213072f3 100644
--- a/src/xine-utils/xmlparser.c
+++ b/src/xine-utils/xmlparser.c
@@ -37,13 +37,13 @@
*/
#ifdef XINE_COMPILE
-#include "xineutils.h"
+#include <xine/xineutils.h>
#else
#define lprintf(...)
#define xine_xmalloc malloc
#endif
-#include "xmllexer.h"
-#include "xmlparser.h"
+#include <xine/xmllexer.h>
+#include <xine/xmlparser.h>
#define TOKEN_SIZE 4 * 1024