1 files changed, 16 insertions, 5 deletions

diff --git a/core/multimedia/opieplayer/libmad/huffman.c b/core/multimedia/opieplayer/libmad/huffman.c
index 8ec9499..5ea6547 100644
--- a/core/multimedia/opieplayer/libmad/huffman.c
+++ b/core/multimedia/opieplayer/libmad/huffman.c
@@ -1,3 +1,3 @@
 /*
- * mad - MPEG audio decoder
+ * libmad - MPEG audio decoder library
  * Copyright (C) 2000-2001 Robert Leslie
@@ -36,4 +36,10 @@
 
-        # define V(v, w, x, y, hlen){      { 1, hlen, v, w, x, y } }
-        # define PTR(offs, bits){ ptr: { 0, bits, offs       } }
+# if defined(__GNUC__)
+        #  define PTR(offs, bits){ ptr:   { 0, bits, offs       } }
+        #  define V(v, w, x, y, hlen){ value: { 1, hlen, v, w, x, y } }
+# else
+        #  define PTR(offs, bits){ { 0, bits, offs } }
+        #  define V(v, w, x, y, hlen){ { 1, hlen, (v << 0) | (w << 1) |  \
+                                             (x << 2) | (y << 3) } }
+# endif
 
@@ -102,4 +108,9 @@ union huffquad const hufftabB[] = {
 
-        # define V(x, y, hlen)  {      { 1, hlen, x, y } }
-        # define PTR(offs, bits){ ptr: { 0, bits, offs } }
+# if defined(__GNUC__)
+        #  define PTR(offs, bits){ ptr:   { 0, bits, offs } }
+        #  define V(x, y, hlen)         { value: { 1, hlen, x, y } }
+# else
+        #  define PTR(offs, bits){ { 0, bits, offs } }
+        #  define V(x, y, hlen)         { { 1, hlen, (x << 0) | (y << 4) } }
+# endif