r729 - /unstable/libquicktime/debian/patches/202_rtjpeg_64bit_fix.diff

[sho at users.alioth.debian.org]

Author: sho
Date: Thu Mar 29 17:17:59 2007
New Revision: 729

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=729
Log:
  * Sync'ed patch.

Modified:
    unstable/libquicktime/debian/patches/202_rtjpeg_64bit_fix.diff

Modified: unstable/libquicktime/debian/patches/202_rtjpeg_64bit_fix.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/patches/202_rtjpeg_64bit_fix.diff?rev=729&op=diff
==============================================================================
--- unstable/libquicktime/debian/patches/202_rtjpeg_64bit_fix.diff (original)
+++ unstable/libquicktime/debian/patches/202_rtjpeg_64bit_fix.diff Thu Mar 29 17:17:59 2007
@@ -1,43 +1,12 @@
-+++ libquicktime-0.9.1/plugins/rtjpeg/mmx.h
-@@ -44,16 +44,19 @@
- #ifndef _MMX_H
- #define _MMX_H
- 
-+
-+#include <stdint.h>
-+
-
- typedef	union {
--	long long		q;	/* Quadword (64-bit) value */
--	unsigned long long	uq;	/* Unsigned Quadword */
--	int			d[2];	/* 2 Doubleword (32-bit) values */
--	unsigned int		ud[2];	/* 2 Unsigned Doubleword */
--	short			w[4];	/* 4 Word (16-bit) values */
--	unsigned short		uw[4];	/* 4 Unsigned Word */
--	char			b[8];	/* 8 Byte (8-bit) values */
--	unsigned char		ub[8];	/* 8 Unsigned Byte */
-+	int64_t			q;	/* Quadword (64-bit) value */
-+	uint64_t		uq;	/* Unsigned Quadword */
-+	int32_t			d[2];	/* 2 Doubleword (32-bit) values */
-+	uint32_t		ud[2];	/* 2 Unsigned Doubleword */
-+	int16_t			w[4];	/* 4 Word (16-bit) values */
-+	uint16_t		uw[4];	/* 4 Unsigned Word */
-+	int8_t			b[8];	/* 8 Byte (8-bit) values */
-+	uint8_t			ub[8];	/* 8 Unsigned Byte */
- 	float			s[2];	/* Single-precision (32-bit) value */
- } __attribute__ ((aligned (8))) mmx_t;	/* On an 8-byte (64-bit) boundary */
- 
 Index: libquicktime-0.9.7/plugins/rtjpeg/mmx.h
 ===================================================================
 --- libquicktime-0.9.7.orig/plugins/rtjpeg/mmx.h	2005-05-22 15:05:19.000000000 +0200
 +++ libquicktime-0.9.7/plugins/rtjpeg/mmx.h	2007-03-29 18:55:17.000000000 +0200
-@@ -31,15 +31,18 @@
+@@ -31,15 +31,16 @@
  #define _MMX_H
  
++#include <stdint.h>
  
-+#include <stdint.h>
-+
-+
  typedef	union {
 -	long long		q;	/* Quadword (64-bit) value */
 -	unsigned long long	uq;	/* Unsigned Quadword */