Remove XINE_COMPILE conditionals where they just changed the include directive paths.

16 files changed, 38 insertions, 128 deletions

diff --git a/include/xine.h b/include/xine.h
index da1d394a3..1d26daa19 100644
--- a/include/xine.h
+++ b/include/xine.h
@@ -55,12 +55,7 @@ extern "C" {
 #include <windowsx.h>
 #endif
 
-#ifdef XINE_COMPILE
-#include <inttypes.h>
-#else
 #include <xine/os_types.h>
-#endif
-
 #include <xine/attributes.h>
 #include <xine/version.h>
 
diff --git a/include/xine/audio_decoder.h b/include/xine/audio_decoder.h
index 307692b81..7e3107727 100644
--- a/include/xine/audio_decoder.h
+++ b/include/xine/audio_decoder.h
@@ -23,13 +23,8 @@
 #ifndef HAVE_AUDIO_DECODER_H
 #define HAVE_AUDIO_DECODER_H
 
-#ifdef XINE_COMPILE
-#  include <inttypes.h>
-#  include "buffer.h"
-#else
-#  include <xine/os_types.h>
-#  include <xine/buffer.h>
-#endif
+#include <xine/os_types.h>
+#include <xine/buffer.h>
 
 #define AUDIO_DECODER_IFACE_VERSION 16
 
diff --git a/include/xine/audio_out.h b/include/xine/audio_out.h
index bd1b910df..8f73bbbf7 100644
--- a/include/xine/audio_out.h
+++ b/include/xine/audio_out.h
@@ -24,18 +24,10 @@
 extern "C" {
 #endif
 
-#if defined(XINE_COMPILE)
-#include <inttypes.h>
-#include "metronom.h"
-#include "configfile.h"
-#include "xineutils.h"
-#else
 #include <xine/os_types.h>
 #include <xine/metronom.h>
 #include <xine/configfile.h>
 #include <xine/xineutils.h>
-#endif
-
 
 #define AUDIO_OUT_IFACE_VERSION  9
 
diff --git a/include/xine/buffer.h b/include/xine/buffer.h
index ce209c9da..4af718a1b 100644
--- a/include/xine/buffer.h
+++ b/include/xine/buffer.h
@@ -43,13 +43,8 @@ extern "C" {
 #include <pthread.h>
 #include <sys/types.h>
 
-#ifdef XINE_COMPILE
-#  include <inttypes.h>
-#  include "attributes.h"
-#else
-#  include <xine/os_types.h>
-#  include <xine/attributes.h>
-#endif
+#include <xine/os_types.h>
+#include <xine/attributes.h>
 
 #define BUF_MAX_CALLBACKS 5
 
diff --git a/include/xine/configfile.h b/include/xine/configfile.h
index 22a544c00..724a75245 100644
--- a/include/xine/configfile.h
+++ b/include/xine/configfile.h
@@ -29,11 +29,7 @@ extern "C" {
 
 #include <pthread.h>
 
-#ifdef XINE_COMPILE
-#  include "xine.h"
-#else
-#  include <xine.h>
-#endif
+#include <xine.h>
 
 #define CONFIG_FILE_VERSION 2
 
diff --git a/include/xine/input_plugin.h b/include/xine/input_plugin.h
index 2917721c9..aa0e2bf47 100644
--- a/include/xine/input_plugin.h
+++ b/include/xine/input_plugin.h
@@ -23,17 +23,10 @@
 
 #include <sys/types.h>
 
-#ifdef XINE_COMPILE
-#  include <inttypes.h>
-#  include "xineutils.h"
-#  include "buffer.h"
-#  include "configfile.h"
-#else
-#  include <xine/os_types.h>
-#  include <xine/xineutils.h>
-#  include <xine/buffer.h>
-#  include <xine/configfile.h>
-#endif
+#include <xine/os_types.h>
+#include <xine/xineutils.h>
+#include <xine/buffer.h>
+#include <xine/configfile.h>
 
 #define INPUT_PLUGIN_IFACE_VERSION   18
  
diff --git a/include/xine/metronom.h b/include/xine/metronom.h
index 77919f16e..df08a0058 100644
--- a/include/xine/metronom.h
+++ b/include/xine/metronom.h
@@ -46,13 +46,8 @@ extern "C" {
 
 #include <pthread.h>
 
-#ifdef XINE_COMPILE
-#  include "video_out.h"
-#  include "xine.h"
-#else
-#  include <xine/video_out.h>
-#  include <xine.h>
-#endif
+#include <xine/video_out.h>
+#include <xine.h>
 
 typedef struct metronom_s metronom_t ;
 typedef struct metronom_clock_s metronom_clock_t;
diff --git a/include/xine/osd.h b/include/xine/osd.h
index ed4e2434b..4e34030ee 100644
--- a/include/xine/osd.h
+++ b/include/xine/osd.h
@@ -27,11 +27,7 @@
 #  include <iconv.h>
 #endif
 
-#ifdef XINE_COMPILE
-#  include "video_overlay.h"
-#else
-#  include <xine/video_overlay.h>
-#endif
+#include <xine/video_overlay.h>
 
 typedef struct osd_object_s osd_object_t;
 typedef struct osd_renderer_s osd_renderer_t;
diff --git a/include/xine/post.h b/include/xine/post.h
index 1995ca82f..4f2b8d272 100644
--- a/include/xine/post.h
+++ b/include/xine/post.h
@@ -23,19 +23,11 @@
 #ifndef XINE_POST_H
 #define XINE_POST_H
 
-#ifdef XINE_COMPILE
-#  include "xine.h"
-#  include "video_out.h"
-#  include "audio_out.h"
-#  include "xine_internal.h"
-#  include "xineutils.h"
-#else
-#  include <xine.h>
-#  include <xine/video_out.h>
-#  include <xine/audio_out.h>
-#  include <xine/xine_internal.h>
-#  include <xine/xineutils.h>
-#endif
+#include <xine.h>
+#include <xine/video_out.h>
+#include <xine/audio_out.h>
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
 
 #define POST_PLUGIN_IFACE_VERSION 9
 
diff --git a/include/xine/spu_decoder.h b/include/xine/spu_decoder.h
index dcf9107f7..b11bf7952 100644
--- a/include/xine/spu_decoder.h
+++ b/include/xine/spu_decoder.h
@@ -24,13 +24,8 @@
 #ifndef HAVE_SPU_API_H
 #define HAVE_SPU_API_H
 
-#ifdef XINE_COMPILE
-#  include <inttypes.h>
-#  include "buffer.h"
-#else
-#  include <xine/os_types.h>
-#  include <xine/buffer.h>
-#endif
+#include <xine/os_types.h>
+#include <xine/buffer.h>
 
 #define SPU_DECODER_IFACE_VERSION 17
 
diff --git a/include/xine/video_decoder.h b/include/xine/video_decoder.h
index 705efa3da..ec0855277 100644
--- a/include/xine/video_decoder.h
+++ b/include/xine/video_decoder.h
@@ -23,13 +23,8 @@
 #ifndef HAVE_VIDEO_DECODER_H
 #define HAVE_VIDEO_DECODER_H
 
-#ifdef XINE_COMPILE
-#  include <inttypes.h>
-#  include "buffer.h"
-#else
-#  include <xine/os_types.h>
-#  include <xine/buffer.h>
-#endif
+#include <xine/os_types.h>
+#include <xine/buffer.h>
 
 #define VIDEO_DECODER_IFACE_VERSION 19
 
diff --git a/include/xine/video_out.h b/include/xine/video_out.h
index 8efdae9f6..83d6986bb 100644
--- a/include/xine/video_out.h
+++ b/include/xine/video_out.h
@@ -42,13 +42,8 @@ extern "C" {
 
 #include <pthread.h>
 
-#ifdef XINE_COMPILE
-#  include "xine.h"
-#  include "buffer.h"
-#else
-#  include <xine.h>
-#  include <xine/buffer.h>
-#endif
+#include <xine.h>
+#include <xine/buffer.h>
 
 
 typedef struct vo_frame_s vo_frame_t; 
diff --git a/include/xine/video_overlay.h b/include/xine/video_overlay.h
index 6bb529204..b45f5149e 100644
--- a/include/xine/video_overlay.h
+++ b/include/xine/video_overlay.h
@@ -21,11 +21,7 @@
 #ifndef HAVE_VIDEO_OVERLAY_H
 #define HAVE_VIDEO_OVERLAY_H
 
-#ifdef XINE_COMPILE
-#  include "xine_internal.h"
-#else
-#  include <xine/xine_internal.h>
-#endif
+#include <xine/xine_internal.h>
 
 #ifdef	__GNUC__
 #define CLUT_Y_CR_CB_INIT(_y,_cr,_cb)	{y: (_y), cr: (_cr), cb: (_cb)}
diff --git a/include/xine/vo_scale.h b/include/xine/vo_scale.h
index e502b2f62..b8b1a535b 100644
--- a/include/xine/vo_scale.h
+++ b/include/xine/vo_scale.h
@@ -33,11 +33,7 @@ extern "C" {
 #include "config.h"
 #endif
 
-#ifdef XINE_COMPILE
-#  include "configfile.h"
-#else
-#  include <xine/configfile.h>
-#endif
+#include <xine/configfile.h>
 
 typedef struct {
   int x, y;
diff --git a/include/xine/xine_buffer.h b/include/xine/xine_buffer.h
index 84511bd1b..73699a2d2 100644
--- a/include/xine/xine_buffer.h
+++ b/include/xine/xine_buffer.h
@@ -50,11 +50,7 @@
 #ifndef HAVE_XINE_BUFFER_H
 #define HAVE_XINE_BUFFER_H
 
-#ifdef XINE_COMPILE
-#  include <inttypes.h>
-#else
-#  include <xine/os_types.h>
-#endif
+#include <xine/os_types.h>
 
 /*
  * returns an initialized pointer to a buffer.
diff --git a/include/xine/xineutils.h b/include/xine/xineutils.h
index 89c62676b..5f052ee58 100644
--- a/include/xine/xineutils.h
+++ b/include/xine/xineutils.h
@@ -33,32 +33,20 @@ extern "C" {
 #include <stdarg.h>
 #include <pthread.h>
 
-#ifdef XINE_COMPILE
-#  include <inttypes.h>
-#  include "attributes.h"
-#  include "compat.h"
-#  include "xmlparser.h"
-#  include "xine_buffer.h"
-#  include "configfile.h"
-#  include "list.h"
-#  include "array.h"
-#  include "sorted_array.h"
+#ifdef WIN32
+#  include <winsock.h>
 #else
-#  ifdef WIN32
-#    include <winsock.h>
-#  else
-#    include <sys/time.h>
-#  endif
-#  include <xine/os_types.h>
-#  include <xine/attributes.h>
-#  include <xine/compat.h>
-#  include <xine/xmlparser.h>
-#  include <xine/xine_buffer.h>
-#  include <xine/configfile.h>
-#  include <xine/list.h>
-#  include <xine/array.h>
-#  include <xine/sorted_array.h>
+#  include <sys/time.h>
 #endif
+#include <xine/os_types.h>
+#include <xine/attributes.h>
+#include <xine/compat.h>
+#include <xine/xmlparser.h>
+#include <xine/xine_buffer.h>
+#include <xine/configfile.h>
+#include <xine/list.h>
+#include <xine/array.h>
+#include <xine/sorted_array.h>
 
 #include <stdio.h>
 #include <string.h>