From 6b52a2e974ba3c3065d13a16cc2fa69f96745d0d Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 16 Oct 2008 18:59:27 +0000
Subject: Change all occurrences of asm and __asm to __asm__, same as was done
 for FFmpeg. Neither variant is valid C99 syntax, but __asm__ is the most
 portable variant.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27788 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mp3lib/dct64_3dnow.c |  2 +-
 mp3lib/dct64_k7.c    |  2 +-
 mp3lib/dct64_mmx.c   |  2 +-
 mp3lib/dct64_sse.c   | 20 ++++++++++----------
 mp3lib/decode_i586.c |  2 +-
 mp3lib/decode_mmx.c  |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'mp3lib')

diff --git a/mp3lib/dct64_3dnow.c b/mp3lib/dct64_3dnow.c
index 3ccd03cf88..8df9295119 100644
--- a/mp3lib/dct64_3dnow.c
+++ b/mp3lib/dct64_3dnow.c
@@ -18,7 +18,7 @@ static float attribute_used plus_1f = 1.0;
 void dct64_MMX_3dnow(short *a,short *b,real *c)
 {
   char tmp[256];
-    __asm __volatile(
+    __asm__ __volatile(
 "	movl %2,%%eax\n\t"
 
 "	leal 128+%3,%%edx\n\t"
diff --git a/mp3lib/dct64_k7.c b/mp3lib/dct64_k7.c
index f668f8b27d..058028ebd1 100644
--- a/mp3lib/dct64_k7.c
+++ b/mp3lib/dct64_k7.c
@@ -18,7 +18,7 @@ static float attribute_used plus_1f = 1.0;
 void dct64_MMX_3dnowex(short *a,short *b,real *c)
 {
   char tmp[256];
-    __asm __volatile(
+    __asm__ __volatile(
 "	movl %2,%%eax\n\t"
 
 "	leal 128+%3,%%edx\n\t"
diff --git a/mp3lib/dct64_mmx.c b/mp3lib/dct64_mmx.c
index 2650ce6c37..317dbb0549 100644
--- a/mp3lib/dct64_mmx.c
+++ b/mp3lib/dct64_mmx.c
@@ -9,7 +9,7 @@
 void dct64_MMX(short *a,short *b,real *c)
 {
     char tmp[256];
-    __asm __volatile(
+    __asm__ __volatile(
 "	movl %2,%%eax\n\t"
 /* Phase 1*/
 "	flds     (%%eax)\n\t"
diff --git a/mp3lib/dct64_sse.c b/mp3lib/dct64_sse.c
index ad835ef14f..34650d01ba 100644
--- a/mp3lib/dct64_sse.c
+++ b/mp3lib/dct64_sse.c
@@ -32,7 +32,7 @@ void dct64_sse(short *out0,short *out1,real *c)
 
         for (i = 0; i < 0x20 / 2; i += 4)
         {
-            asm(
+            __asm__(
                 "movaps    %2, %%xmm3\n\t"
                 "shufps    $27, %%xmm3, %%xmm3\n\t"
                 "movaps    %3, %%xmm1\n\t"
@@ -57,7 +57,7 @@ void dct64_sse(short *out0,short *out1,real *c)
 
         for (i = 0; i < 0x20; i += 0x10)
         {
-            asm(
+            __asm__(
                 "movaps    %4, %%xmm1\n\t"
                 "movaps    %5, %%xmm3\n\t"
                 "movaps    %6, %%xmm4\n\t"
@@ -86,7 +86,7 @@ void dct64_sse(short *out0,short *out1,real *c)
 
     {
         real *costab = costab_mmx + 16;
-        asm(
+        __asm__(
             "movaps    %4, %%xmm0\n\t"
             "movaps    %5, %%xmm1\n\t"
             "movaps    %8, %%xmm4\n\t"
@@ -116,7 +116,7 @@ void dct64_sse(short *out0,short *out1,real *c)
         real *costab = costab_mmx + 24;
         int i;
 
-        asm(
+        __asm__(
             "movaps    %0, %%xmm0\n\t"
             "shufps    $27, %%xmm0, %%xmm0\n\t"
             "movaps    %1, %%xmm5\n\t"
@@ -127,7 +127,7 @@ void dct64_sse(short *out0,short *out1,real *c)
 
         for (i = 0; i < 0x20; i += 8)
         {
-            asm(
+            __asm__(
                 "movaps    %2, %%xmm2\n\t"
                 "movaps    %3, %%xmm3\n\t"
                 "movaps    %%xmm2, %%xmm4\n\t"
@@ -150,7 +150,7 @@ void dct64_sse(short *out0,short *out1,real *c)
     {
         int i;
 
-        asm(
+        __asm__(
             "movss     %0, %%xmm1\n\t"
             "movss     %1, %%xmm0\n\t"
             "movaps    %%xmm1, %%xmm3\n\t"
@@ -166,7 +166,7 @@ void dct64_sse(short *out0,short *out1,real *c)
 
         for (i = 0; i < 0x20; i += 8)
         {
-            asm(
+            __asm__(
                 "movaps    %2, %%xmm3\n\t"
                 "movaps    %%xmm3, %%xmm4\n\t"
                 "shufps    $20, %%xmm4, %%xmm4\n\t"
@@ -190,7 +190,7 @@ void dct64_sse(short *out0,short *out1,real *c)
 
     {
         int i;
-        asm(
+        __asm__(
             "movss     %0, %%xmm0\n\t"
             "movaps    %%xmm1, %%xmm2\n\t"
             "movaps    %%xmm0, %%xmm7\n\t"
@@ -204,7 +204,7 @@ void dct64_sse(short *out0,short *out1,real *c)
 
         for (i = 0x8; i < 0x20; i += 8)
         {
-            asm volatile (
+            __asm__ volatile (
                           "movaps    %2, %%xmm1\n\t"
                           "movaps    %%xmm1, %%xmm3\n\t"
                           "shufps    $224, %%xmm3, %%xmm3\n\t"
@@ -285,7 +285,7 @@ void dct64_sse(short *out0,short *out1,real *c)
        To do saturation efficiently in x86 we can use fist(t)(p),
        pf2iw, or packssdw. We use fist(p) here.
     */
-    asm(
+    __asm__(
         "flds       %0\n\t"
         "flds     (%2)\n\t"
         "fadds   4(%2)\n\t"
diff --git a/mp3lib/decode_i586.c b/mp3lib/decode_i586.c
index 0d1370f342..9ca1aeb360 100644
--- a/mp3lib/decode_i586.c
+++ b/mp3lib/decode_i586.c
@@ -41,7 +41,7 @@ int synth_1to1_pent(real *bandPtr, int channel, short *samples)
 {
   real tmp[3];
   register int retval;
-    __asm __volatile(
+    __asm__ __volatile(
 "        movl %%ebp,"MANGLE(saved_ebp)"\n\t"
 "        movl %1,%%eax\n\t"/*bandPtr*/
 "        movl %3,%%esi\n\t"
diff --git a/mp3lib/decode_mmx.c b/mp3lib/decode_mmx.c
index 613a11cf35..1d4e3caba9 100644
--- a/mp3lib/decode_mmx.c
+++ b/mp3lib/decode_mmx.c
@@ -217,7 +217,7 @@ int synth_1to1_MMX(real *bandPtr, int channel, short *samples)
     dct64_MMX_func(a, b, bandPtr);
     window = mp3lib_decwins + 16 - bo1;
     //printf("DEBUG: channel %d, bo %d, off %d\n", channel, bo, 16 - bo1);
-__asm __volatile(
+__asm__ __volatile(
 ASMALIGN(4)
 ".L03:\n\t"
         "movq  (%1),%%mm0\n\t"
-- 
cgit v1.2.3