summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrantišek Dvořák <valtri@users.sourceforge.net>2005-07-30 11:26:09 +0000
committerFrantišek Dvořák <valtri@users.sourceforge.net>2005-07-30 11:26:09 +0000
commit8d23812f7faeb1ab1f397ebf0fdc21593d9b37fd (patch)
tree285d72aed38374dc6baf0b979b0d2920f494da71
parent8676938b235b503d0159a686d58246e78e61cb77 (diff)
downloadxine-lib-8d23812f7faeb1ab1f397ebf0fdc21593d9b37fd.tar.gz
xine-lib-8d23812f7faeb1ab1f397ebf0fdc21593d9b37fd.tar.bz2
*BUGFIX*
Let handle inttypes by config.h, sun specific includes moved to os_internal.h. CVS patchset: 7701 CVS date: 2005/07/30 11:26:09
-rw-r--r--lib/os_internal.h12
-rw-r--r--src/video_out/video_out_xv.c8
2 files changed, 13 insertions, 7 deletions
diff --git a/lib/os_internal.h b/lib/os_internal.h
index c79448a22..2f6d19779 100644
--- a/lib/os_internal.h
+++ b/lib/os_internal.h
@@ -1,6 +1,18 @@
#include <stddef.h>
#include "os_types.h"
+#if defined (__SVR4) && defined (__sun)
+# include <sys/int_types.h>
+
+/* maybe needed for FreeBSD 4-STABLE */
+/*
+#elif defined (__FreeBSD__)
+# include <stdint.h>
+*/
+
+#endif
+
+
/* replacement of strndup */
#ifndef HAVE_STRNDUP
#define strndup(S, N) _xine_private_strndup((S), (N))
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index da34ee309..ddc40d8b7 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -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: video_out_xv.c,v 1.211 2005/07/29 19:25:43 jstembridge Exp $
+ * $Id: video_out_xv.c,v 1.212 2005/07/30 11:26:09 valtri Exp $
*
* video_out_xv.c, X11 video extension interface for xine
*
@@ -44,12 +44,6 @@
#include <errno.h>
#include <math.h>
-#if defined (__SVR4) && defined (__sun)
-# include <sys/int_types.h>
-#else
-# include "os_types.h"
-#endif
-
#include <sys/types.h>
#if defined(__FreeBSD__)
#include <machine/param.h>