[Mplayer-cvslog] CVS: main/mp3lib dct64_3dnow.c,1.3,1.4 dct64_MMX.c,1.2,1.3 dct64_k7.c,1.3,1.4 sr1.c,1.21,1.22

[Atmosfear]

Update of /cvsroot/mplayer/main/mp3lib
In directory mail:/var/tmp.root/cvs-serv23749

Modified Files:
	dct64_3dnow.c dct64_MMX.c dct64_k7.c sr1.c 
Log Message:
Cygwin stdcall mismatch fix.


Index: dct64_3dnow.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/dct64_3dnow.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dct64_3dnow.c	26 Apr 2002 19:14:47 -0000	1.3
+++ dct64_3dnow.c	24 May 2002 01:56:01 -0000	1.4
@@ -14,12 +14,7 @@
 static unsigned long long int __attribute__((aligned(8))) x_plus_minus_3dnow = 0x8000000000000000ULL;
 static float plus_1f = 1.0;
 
-#ifdef __CYGWIN__
-/* will probably cause sig11 with debuggingsymbols, but otherwise undef. ref */
-void dct64_MMX_3dnow(real *a,real *b,real *c)
-#else
 void __attribute__ (( __stdcall__ )) dct64_MMX_3dnow(real *a,real *b,real *c)
-#endif
 {
   char tmp[256];
     __asm __volatile(

Index: dct64_MMX.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/dct64_MMX.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dct64_MMX.c	19 Jan 2002 04:47:32 -0000	1.2
+++ dct64_MMX.c	24 May 2002 01:56:01 -0000	1.3
@@ -6,12 +6,7 @@
 #include "../mangle.h"
 #define real float /* ugly - but only way */
 
-#ifdef __CYGWIN__
-/* will probably cause sig11 with debuggingsymbols, but otherwise undef. ref */
-void dct64_MMX(real *a,real *b,real *c)
-#else
 void __attribute__ (( __stdcall__ )) dct64_MMX(real *a,real *b,real *c)
-#endif
 {
     char tmp[256];
     __asm __volatile(

Index: dct64_k7.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/dct64_k7.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dct64_k7.c	26 Apr 2002 19:14:47 -0000	1.3
+++ dct64_k7.c	24 May 2002 01:56:01 -0000	1.4
@@ -14,12 +14,7 @@
 static unsigned long long int __attribute__((aligned(8))) x_plus_minus_3dnow = 0x8000000000000000ULL;
 static float plus_1f = 1.0;
 
-#ifdef __CYGWIN__
-/* will probably cause sig11 with debuggingsymbols, but otherwise undef. ref */
-void dct64_MMX_3dnowex(real *a,real *b,real *c)
-#else
 void __attribute__ (( __stdcall__ )) dct64_MMX_3dnowex(real *a,real *b,real *c)
-#endif
 {
   char tmp[256];
     __asm __volatile(

Index: sr1.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/sr1.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sr1.c	20 May 2002 03:25:25 -0000	1.21
+++ sr1.c	24 May 2002 01:56:01 -0000	1.22
@@ -373,11 +373,11 @@
 static int tables_done_flag=0;
 
 /* It's hidden from gcc in assembler */
-extern void dct64_MMX( void );
-extern void dct64_MMX_3dnow( void );
-extern void dct64_MMX_3dnowex( void );
-extern void dct64_MMX_sse( void );
-void (*dct64_MMX_func)( void );
+extern void __attribute__((__stdcall__)) dct64_MMX(real *, real *, real *);
+extern void __attribute__((__stdcall__)) dct64_MMX_3dnow(real *, real *, real *);
+extern void __attribute__((__stdcall__)) dct64_MMX_3dnowex(real *, real *, real *);
+extern void __attribute__((__stdcall__)) dct64_MMX_sse(real *, real *, real *);
+void __attribute__((__stdcall__)) (*dct64_MMX_func)(real *, real *, real *);
 
 #include "../cpudetect.h"