From 7204b84beb0f5cfb166e8d56402371d05bece83b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?=
 <valtri@users.sourceforge.net>
Date: Mon, 20 Sep 2004 19:30:02 +0000
Subject: Build system improvements:  - use replacement functions (macro
 AC_REPLACE_FUNCS and variable LTLIBOBJS),    each function is in a file
 placed into lib/ directory,    it was not necessary, but it looks nice, IMHO 
 - headers cleanups (this was needed):      - prototypes of replacement
 funtions and macros are placed        into separate os_internal.h (and
 included by config.h)      - drop include inttypes.h from public xine.h,
 replaced by custom        os_type.h, idea origins from Ogg/Vorbis public
 headers      - disable generating inttypes.h: generated replacement isn't
 enough for        xine-lib but nobody complained (and for M$VC we have
 special version)      - better including headers for win32, let dvdnav use
 its mutex wrapper  - updated M$VC port Result:   - xine is compiled nicely by
 MinGW, CygWin and paritaly M$VC   - frontends in M$VC port don't require
 additional helping headers   - moved some platform specific things from
 xine-utils and win32/contrib     to lib/ Finally I can start with real
 coding. :-)

CVS patchset: 6982
CVS date: 2004/09/20 19:30:02
---
 include/xine.h.in | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'include')

diff --git a/include/xine.h.in b/include/xine.h.in
index 0ef399e7f..5ca1966fd 100644
--- a/include/xine.h.in
+++ b/include/xine.h.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2004 the xine project
  *
  * This file is part of xine, a free video player.
  *
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine.h.in,v 1.128 2004/09/06 18:34:38 valtri Exp $
+ * $Id: xine.h.in,v 1.129 2004/09/20 19:30:03 valtri Exp $
  *
  * public xine-lib (libxine) interface and documentation
  *
@@ -48,15 +48,21 @@ extern "C" {
 #endif
 
 #include <sys/types.h>
-#include <inttypes.h>
 #include <sys/time.h>
 #include <time.h>
 
 #ifdef WIN32
-#  include <windows.h>
-#  include <windowsx.h>
+#include <windows.h>
+#include <windowsx.h>
 #endif
 
+#ifdef XINE_COMPILE
+#include <inttypes.h>
+#else
+#include <xine/os_types.h>
+#endif
+
+
 /* This enables some experimental features. These are not part of the
  * official libxine API, so use them only, if you absolutely need them.
  * Although we make efforts to keep even this part of the API as stable
@@ -71,7 +77,6 @@ extern "C" {
  */
 /* #define XINE_DISABLE_DEPRECATED_FEATURES */
 
-
 /*********************************************************************
  * xine opaque data types                                            *
  *********************************************************************/
-- 
cgit v1.2.3