summaryrefslogtreecommitdiff
path: root/src/libw32dll
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-12-22 21:00:56 +0100
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-12-22 21:00:56 +0100
commit4e9a84a12a49c7a5242d4e372e5961e418ff18df (patch)
tree7480c4193fbf0386c66ef240a6805a3d93f9963c /src/libw32dll
parent9b3fc5f500954e2deb241c17b0437ec8afad025e (diff)
parent3a217974c83b61f59a8a86684802864d4f9e03d6 (diff)
downloadxine-lib-4e9a84a12a49c7a5242d4e372e5961e418ff18df.tar.gz
xine-lib-4e9a84a12a49c7a5242d4e372e5961e418ff18df.tar.bz2
Merge -headers-reshuffle branch into main.
--HG-- rename : src/xine-engine/osd.h => include/xine/osd.h
Diffstat (limited to 'src/libw32dll')
-rw-r--r--src/libw32dll/qt_decoder.c6
-rw-r--r--src/libw32dll/w32codec.c10
-rw-r--r--src/libw32dll/wine/debugtools.h2
-rw-r--r--src/libw32dll/wine/ext.h2
-rw-r--r--src/libw32dll/wine/registry.c2
-rw-r--r--src/libw32dll/wine/win32.c2
6 files changed, 12 insertions, 12 deletions
diff --git a/src/libw32dll/qt_decoder.c b/src/libw32dll/qt_decoder.c
index ca358bb9b..64e30d637 100644
--- a/src/libw32dll/qt_decoder.c
+++ b/src/libw32dll/qt_decoder.c
@@ -38,9 +38,9 @@
*/
#include "bswap.h"
-#include "xine_internal.h"
-#include "audio_out.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/audio_out.h>
+#include <xine/buffer.h>
#include "qtx/qtxsdk/components.h"
#include "wine/win32.h"
diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c
index 3b66dfb23..bcb5db53c 100644
--- a/src/libw32dll/w32codec.c
+++ b/src/libw32dll/w32codec.c
@@ -50,11 +50,11 @@
#define LOG
*/
-#include "xine_internal.h"
-#include "video_out.h"
-#include "audio_out.h"
-#include "buffer.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/video_out.h>
+#include <xine/audio_out.h>
+#include <xine/buffer.h>
+#include <xine/xineutils.h>
#include "common.c"
diff --git a/src/libw32dll/wine/debugtools.h b/src/libw32dll/wine/debugtools.h
index 3b342e10c..c6fac518d 100644
--- a/src/libw32dll/wine/debugtools.h
+++ b/src/libw32dll/wine/debugtools.h
@@ -8,7 +8,7 @@
#include "config.h"
#include "windef.h"
-#include "compat.h"
+#include <xine/compat.h>
struct _GUID;
diff --git a/src/libw32dll/wine/ext.h b/src/libw32dll/wine/ext.h
index f0f505c4d..ad22edc5e 100644
--- a/src/libw32dll/wine/ext.h
+++ b/src/libw32dll/wine/ext.h
@@ -2,7 +2,7 @@
#define loader_ext_h
#include "windef.h"
-#include "attributes.h"
+#include <xine/attributes.h>
extern LPVOID FILE_dommap( int unix_handle, LPVOID start,
DWORD size_high, DWORD size_low,
diff --git a/src/libw32dll/wine/registry.c b/src/libw32dll/wine/registry.c
index c8e3c4dd0..20c21888d 100644
--- a/src/libw32dll/wine/registry.c
+++ b/src/libw32dll/wine/registry.c
@@ -18,7 +18,7 @@
#include "debugtools.h"
#ifdef XINE_MAJOR
-#include "xineutils.h"
+#include <xine/xineutils.h>
#include <basedir.h>
#endif
diff --git a/src/libw32dll/wine/win32.c b/src/libw32dll/wine/win32.c
index 3b0941391..ce8132d3f 100644
--- a/src/libw32dll/wine/win32.c
+++ b/src/libw32dll/wine/win32.c
@@ -12,7 +12,7 @@ for DLL to know too much about its environment.
************************************************************/
#include "config.h"
-#include "attributes.h"
+#include <xine/attributes.h>
#define QTX