summaryrefslogtreecommitdiff
path: root/src/video_out
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2003-07-12 12:31:13 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2003-07-12 12:31:13 +0000
commitecde3c9f3e46a78f653829f8b12241dc7fbe9fb2 (patch)
tree2da90cafcf53ca75af95ae22c8e9269a55447e4b /src/video_out
parent7329ae3b83a71b6bc9b55c659a582afb307acd08 (diff)
downloadxine-lib-ecde3c9f3e46a78f653829f8b12241dc7fbe9fb2.tar.gz
xine-lib-ecde3c9f3e46a78f653829f8b12241dc7fbe9fb2.tar.bz2
- adding support for the Intel compiler icc
- general multipass compilation make targets CVS patchset: 5149 CVS date: 2003/07/12 12:31:13
Diffstat (limited to 'src/video_out')
-rw-r--r--src/video_out/alphablend.h2
-rw-r--r--src/video_out/libdha/AsmMacros.h2
-rw-r--r--src/video_out/video_out_xv.c8
3 files changed, 9 insertions, 3 deletions
diff --git a/src/video_out/alphablend.h b/src/video_out/alphablend.h
index 71ecc73cd..05683924c 100644
--- a/src/video_out/alphablend.h
+++ b/src/video_out/alphablend.h
@@ -32,7 +32,7 @@
#undef PRAGMA_PACK_BEGIN
#undef PRAGMA_PACK_END
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) || defined(__ICC)
#define ATTRIBUTE_PACKED __attribute__ ((packed))
#define PRAGMA_PACK 0
#endif
diff --git a/src/video_out/libdha/AsmMacros.h b/src/video_out/libdha/AsmMacros.h
index 1549a6a7c..d1b136a7b 100644
--- a/src/video_out/libdha/AsmMacros.h
+++ b/src/video_out/libdha/AsmMacros.h
@@ -63,7 +63,7 @@
* Modified for readability by Nick Kurshev
*/
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(__ICC)
#if defined(__alpha__)
#include "sysdep/AsmMacros_alpha.h"
#elif defined(__ia64__)
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index b62e192c5..900d137fa 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.169 2003/05/31 18:33:31 miguelfreitas Exp $
+ * $Id: video_out_xv.c,v 1.170 2003/07/12 12:31:14 mroi Exp $
*
* video_out_xv.c, X11 video extension interface for xine
*
@@ -42,6 +42,12 @@
#include <string.h>
#include <math.h>
+#if defined (__SVR4) && defined (__sun)
+# include <sys/int_types.h>
+#else
+# include <stdint.h>
+#endif
+
#if defined(__FreeBSD__)
#include <machine/param.h>
#endif