summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2007-06-08 00:40:11 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2007-06-08 00:40:11 +0100
commit9043d0680a6e15ab0058e8cabc48610de50cc29a (patch)
treefbd816acdde66a385411120a44a1af9f479cdca5 /src
parent73c6bfed31352563e976fe5bac6e218c74f99e6a (diff)
downloadxine-lib-9043d0680a6e15ab0058e8cabc48610de50cc29a.tar.gz
xine-lib-9043d0680a6e15ab0058e8cabc48610de50cc29a.tar.bz2
Fix build issues on systems which need our internal asprintf.
config.h is now include/configure.h and no longer #includes os_internals.h. A new file, include/config.h, #includes both; this breaks a #include loop. Other files are updated accordingly.
Diffstat (limited to 'src')
-rw-r--r--src/libfaad/common.h2
-rw-r--r--src/xine-utils/attributes.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libfaad/common.h b/src/libfaad/common.h
index 47832e648..31f07708a 100644
--- a/src/libfaad/common.h
+++ b/src/libfaad/common.h
@@ -36,7 +36,7 @@ extern "C" {
#define __STRICT_ANSI__
#endif
-#include "../config.h"
+#include "config.h"
#define INLINE __inline
#if 0 //defined(_WIN32) && !defined(_WIN32_WCE)
diff --git a/src/xine-utils/attributes.h b/src/xine-utils/attributes.h
index 13c787925..2a7029522 100644
--- a/src/xine-utils/attributes.h
+++ b/src/xine-utils/attributes.h
@@ -45,7 +45,7 @@
#endif
#ifdef XINE_COMPILE
-# include "config.h"
+# include "configure.h"
#endif
/* Export protected only for libxine functions */