[xine-cvs] CVS: xine-lib/include xine.h.in,1.128,1.129

[Frantisek D. <va...@us...>]

Update of /cvsroot/xine/xine-lib/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15373/include

Modified Files:
	xine.h.in 
Log Message:
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. :-) 



Index: xine.h.in
===================================================================
RCS file: /cvsroot/xine/xine-lib/include/xine.h.in,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- xine.h.in	6 Sep 2004 18:34:38 -0000	1.128
+++ xine.h.in	20 Sep 2004 19:30:03 -0000	1.129
@@ -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.
  *
@@ -48,15 +48,21 @@
 #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 @@
  */
 /* #define XINE_DISABLE_DEPRECATED_FEATURES */
 
-
 /*********************************************************************
  * xine opaque data types                                            *
  *********************************************************************/