From 4ade55ceac7dacfe401d3ee4304fa508c855075c Mon Sep 17 00:00:00 2001
From: atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 24 May 2002 01:56:01 +0000
Subject: Cygwin stdcall mismatch fix.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6178 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mp3lib/dct64_3dnow.c |  5 -----
 mp3lib/dct64_MMX.c   |  5 -----
 mp3lib/dct64_k7.c    |  5 -----
 mp3lib/sr1.c         | 10 +++++-----
 4 files changed, 5 insertions(+), 20 deletions(-)

(limited to 'mp3lib')

diff --git a/mp3lib/dct64_3dnow.c b/mp3lib/dct64_3dnow.c
index 4a3b83c8d0..6f5809de39 100644
--- a/mp3lib/dct64_3dnow.c
+++ b/mp3lib/dct64_3dnow.c
@@ -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(
diff --git a/mp3lib/dct64_MMX.c b/mp3lib/dct64_MMX.c
index b1f7753045..b99427f0a9 100644
--- a/mp3lib/dct64_MMX.c
+++ b/mp3lib/dct64_MMX.c
@@ -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(
diff --git a/mp3lib/dct64_k7.c b/mp3lib/dct64_k7.c
index c1237a4652..bc14bfc6f1 100644
--- a/mp3lib/dct64_k7.c
+++ b/mp3lib/dct64_k7.c
@@ -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(
diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c
index c3716b0626..9688c2cc5c 100644
--- a/mp3lib/sr1.c
+++ b/mp3lib/sr1.c
@@ -373,11 +373,11 @@ int _has_mmx = 0;
 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"
 
-- 
cgit v1.2.3