shithub: sox

Download patch

ref: bd0eddd5f55b60192837166f8f6cf753c7b3f85f
parent: a5749149e84669fde87c20fe4ba985589721b404
author: cbagwell <cbagwell>
date: Wed Sep 22 21:10:01 EDT 2004 

Some compilers don't like inline and static used together.


--- a/src/adpcm.c
+++ b/src/adpcm.c
@@ -71,8 +71,8 @@
                         { 392,-232}
 };
 
-inline static st_sample_t AdpcmDecode(st_sample_t c, MsState_t *state,
-                                      st_sample_t sample1, st_sample_t sample2)
+inline st_sample_t AdpcmDecode(st_sample_t c, MsState_t *state,
+                               st_sample_t sample1, st_sample_t sample2)
 {
         st_sample_t vlin;
         st_sample_t sample;
@@ -151,11 +151,11 @@
                 ch = 0;
                 while (op < top) {
                         b = *ip++;
-			tmp = op;
+                        tmp = op;
                         *op++ = AdpcmDecode(b >> 4, state+ch, tmp[-chans], tmp[-2*chans]);
                         if (++ch == chans) ch = 0;
                         /* ch = ++ch % chans; */
-			tmp = op;
+                        tmp = op;
                         *op++ = AdpcmDecode(b&0x0f, state+ch, tmp[-chans], tmp[-2*chans]);
                         if (++ch == chans) ch = 0;
                         /* ch = ++ch % chans; */
@@ -302,7 +302,7 @@
 
 #endif
 
-inline static void AdpcmMashChannel(
+inline void AdpcmMashChannel(
         int ch,             /* channel number to encode, REQUIRE 0 <= ch < chans  */
         int chans,          /* total channels */
         const SAMPL *ip,    /* ip[] is interleaved input samples */