[xiph-commits] r11701 - in trunk/theora/lib: . x86_64

[giles at svn.xiph.org]

Author: giles
Date: 2006-07-11 22:36:10 -0700 (Tue, 11 Jul 2006)
New Revision: 11701

Modified:
   trunk/theora/lib/dsp.h
   trunk/theora/lib/x86_64/dsp_mmx.c
   trunk/theora/lib/x86_64/dsp_mmxext.c
   trunk/theora/lib/x86_64/recon_mmx.c
Log:
Move the typedef for ogg_uint64_t from the general dsp.h to the specific 
x86_64 implementation files where it is required. There are a few 
architectures where libogg actually defines this, and if there's a type 
conflict (the define in dsp.h was also the wrong width on most 32 bit 
machines) this limits the damage.

Ideally we should either remove this, or require libogg to always define
it properly. There used to be an issue on MSVC but I believe it has been
resolved, so the later route is possible.


Modified: trunk/theora/lib/dsp.h
===================================================================
--- trunk/theora/lib/dsp.h	2006-07-10 11:44:05 UTC (rev 11700)
+++ trunk/theora/lib/dsp.h	2006-07-12 05:36:10 UTC (rev 11701)
@@ -19,7 +19,6 @@
 #define DSP_H
 
 #include <theora/theora.h>
-typedef unsigned long int ogg_uint64_t;
 
 typedef struct
 {

Modified: trunk/theora/lib/x86_64/dsp_mmx.c
===================================================================
--- trunk/theora/lib/x86_64/dsp_mmx.c	2006-07-10 11:44:05 UTC (rev 11700)
+++ trunk/theora/lib/x86_64/dsp_mmx.c	2006-07-12 05:36:10 UTC (rev 11701)
@@ -20,6 +20,8 @@
 #include "codec_internal.h"
 #include "dsp.h"
 
+typedef unsigned long long ogg_uint64_t;
+
 static const __attribute__ ((aligned(8),used)) ogg_int64_t V128 = 0x0080008000800080LL;
 
 #define DSP_OP_AVG(a,b) ((((int)(a)) + ((int)(b)))/2)

Modified: trunk/theora/lib/x86_64/dsp_mmxext.c
===================================================================
--- trunk/theora/lib/x86_64/dsp_mmxext.c	2006-07-10 11:44:05 UTC (rev 11700)
+++ trunk/theora/lib/x86_64/dsp_mmxext.c	2006-07-12 05:36:10 UTC (rev 11701)
@@ -20,6 +20,8 @@
 #include "codec_internal.h"
 #include "dsp.h"
 
+typedef unsigned long long ogg_uint64_t;
+
 static ogg_uint32_t sad8x8__mmxext (unsigned char *ptr1, ogg_uint32_t stride1,
                                     unsigned char *ptr2, ogg_uint32_t stride2)
 {

Modified: trunk/theora/lib/x86_64/recon_mmx.c
===================================================================
--- trunk/theora/lib/x86_64/recon_mmx.c	2006-07-10 11:44:05 UTC (rev 11700)
+++ trunk/theora/lib/x86_64/recon_mmx.c	2006-07-12 05:36:10 UTC (rev 11701)
@@ -17,6 +17,8 @@
 
 #include "codec_internal.h"
 
+typedef unsigned long long ogg_uint64_t;
+
 static const __attribute__ ((aligned(8),used)) ogg_int64_t V128 = 0x8080808080808080LL;
 
 static void copy8x8__mmx (unsigned char *src,