summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Schaefer <heikos@users.sourceforge.net>2003-02-13 19:04:52 +0000
committerHeiko Schaefer <heikos@users.sourceforge.net>2003-02-13 19:04:52 +0000
commit63be400ebc6f14e329b4ea5af7237b50df8ce804 (patch)
treedb4eea689628ebcebe2bdc42d1d5069e8d22ee0a
parentddd6fcdb2dfd70a575f865758f1fec3ff7b5c105 (diff)
downloadxine-lib-63be400ebc6f14e329b4ea5af7237b50df8ce804.tar.gz
xine-lib-63be400ebc6f14e329b4ea5af7237b50df8ce804.tar.bz2
FreeBSD compile fixes
CVS patchset: 4146 CVS date: 2003/02/13 19:04:52
-rw-r--r--src/video_out/libdha/irq.c1
-rw-r--r--src/video_out/libdha/kernelhelper/dhahelper.h2
-rw-r--r--src/video_out/libdha/libdha.h6
-rw-r--r--src/video_out/libdha/mmi.c1
-rw-r--r--src/video_out/video_out_sdl.c8
-rw-r--r--src/video_out/vidix/drivers/radeon_vid.c1
6 files changed, 15 insertions, 4 deletions
diff --git a/src/video_out/libdha/irq.c b/src/video_out/libdha/irq.c
index 6ac852857..abccaf74c 100644
--- a/src/video_out/libdha/irq.c
+++ b/src/video_out/libdha/irq.c
@@ -1,6 +1,7 @@
/* HW IRQ support */
#include <stdio.h>
#include <sys/ioctl.h>
+#include <sys/types.h>
#include <sys/mman.h> /* mlock */
#include <pthread.h>
#include <errno.h>
diff --git a/src/video_out/libdha/kernelhelper/dhahelper.h b/src/video_out/libdha/kernelhelper/dhahelper.h
index 3932b96ab..4c12840f4 100644
--- a/src/video_out/libdha/kernelhelper/dhahelper.h
+++ b/src/video_out/libdha/kernelhelper/dhahelper.h
@@ -7,7 +7,7 @@
#ifndef DHAHELPER_H
#define DHAHELPER_H
-#include <linux/ioctl.h>
+/* #include <linux/ioctl.h> */
/* feel free to change */
#define DEFAULT_MAJOR 252 /* 240-254 LOCAL/EXPERIMENTAL USE */
diff --git a/src/video_out/libdha/libdha.h b/src/video_out/libdha/libdha.h
index 53a96839d..850697ada 100644
--- a/src/video_out/libdha/libdha.h
+++ b/src/video_out/libdha/libdha.h
@@ -16,7 +16,11 @@
#ifndef LIBDHA_H
#define LIBDHA_H
-#include <stdint.h>
+#if defined (__FreeBSD__)
+# include <inttypes.h>
+#else
+# include <stdint.h>
+#endif
#ifdef __cplusplus
extern "C" {
diff --git a/src/video_out/libdha/mmi.c b/src/video_out/libdha/mmi.c
index 5fb1531be..ffdf8df15 100644
--- a/src/video_out/libdha/mmi.c
+++ b/src/video_out/libdha/mmi.c
@@ -1,6 +1,7 @@
/* Memory manager interface */
#include <stdio.h>
#include <sys/ioctl.h>
+#include <sys/types.h>
#include <sys/mman.h> /* mlock */
#include <errno.h>
#include <unistd.h>
diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c
index 8288bf94c..9ede5d8e0 100644
--- a/src/video_out/video_out_sdl.c
+++ b/src/video_out/video_out_sdl.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_sdl.c,v 1.21 2003/01/29 15:34:28 miguelfreitas Exp $
+ * $Id: video_out_sdl.c,v 1.22 2003/02/13 19:04:52 heikos Exp $
*
* video_out_sdl.c, Simple DirectMedia Layer
*
@@ -47,7 +47,11 @@
#include <string.h>
#include <inttypes.h>
#include <math.h>
-#include <SDL/SDL.h>
+#if defined (__FreeBSD__)
+# include <SDL11/SDL.h>
+#else
+# include <SDL/SDL.h>
+#endif
#include "xine.h"
#include "xine_internal.h"
diff --git a/src/video_out/vidix/drivers/radeon_vid.c b/src/video_out/vidix/drivers/radeon_vid.c
index 7864083a8..574225c8b 100644
--- a/src/video_out/vidix/drivers/radeon_vid.c
+++ b/src/video_out/vidix/drivers/radeon_vid.c
@@ -11,6 +11,7 @@
#include <string.h>
#include <math.h>
#include <inttypes.h>
+#include <sys/types.h>
#include <sys/mman.h>
#include "bswap.h"
#include "pci_ids.h"