From a6ed8a1de97a70668a8feaeade2a11cc4c93185f Mon Sep 17 00:00:00 2001
From: Michael Mann <mmann78@netscape.net>
Date: Wed, 8 Jan 2014 01:58:06 +0000
Subject: [PATCH] Have HAVE_SPANDSP just go over entire file rather than
 individual functions.

svn path=/trunk/; revision=54645
---
 codecs/G722/G722decode.c | 14 ++------------
 codecs/G726/G726decode.c | 18 ++++--------------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/codecs/G722/G722decode.c b/codecs/G722/G722decode.c
index e7e47dfa78..b668b2bf57 100644
--- a/codecs/G722/G722decode.c
+++ b/codecs/G722/G722decode.c
@@ -29,33 +29,23 @@
 #ifdef HAVE_SPANDSP
 #include "telephony.h"
 #include "g722.h"
-#endif
 #include "G722decode.h"
 
-#ifdef HAVE_SPANDSP
 static g722_decode_state_t state;
-#endif
 
 void
 initG722(void)
 {
-#ifdef HAVE_SPANDSP
     memset (&state, 0, sizeof (state));
     g722_decode_init(&state, 64000, 0);
-#endif
 }
 
-#ifdef HAVE_SPANDSP
-#define _U_NOSPANDSP_
-#else
-#define _U_NOSPANDSP_ _U_
-#endif
 int
 decodeG722(void *input _U_NOSPANDSP_, int inputSizeBytes _U_NOSPANDSP_,
            void *output _U_NOSPANDSP_, int *outputSizeBytes _U_NOSPANDSP_)
 {
-#ifdef HAVE_SPANDSP
     *outputSizeBytes = g722_decode(&state, output, input, inputSizeBytes);
-#endif
     return 0;
 }
+
+#endif
diff --git a/codecs/G726/G726decode.c b/codecs/G726/G726decode.c
index bb2515719e..bcc2cd1fdc 100644
--- a/codecs/G726/G726decode.c
+++ b/codecs/G726/G726decode.c
@@ -29,39 +29,29 @@
 #include "telephony.h"
 #include "bitstream.h"
 #include "g726.h"
-#endif
 #include "G726decode.h"
 
-#ifdef HAVE_SPANDSP
 /* this isn't reentrant. Making it might involve quite a few changes to be able to pass a g726 state
  * variable to the various functions involved in G.726 decoding.
  */
 static g726_state_t state;
-#endif
 
 /* Currently, only G.726-32, linear encoding, left packed is supported */
 void initG726_32(void)
 {
-#ifdef HAVE_SPANDSP
     memset (&state, 0, sizeof (state));
     g726_init(&state, 32000, 0, 1);
-#endif
 }
 
 /* Packing should be user defined (via the decode dialog) since due to historical reasons two diverging
  * de facto standards are in use today (see RFC3551).
  */
-#ifdef HAVE_SPANDSP
-#define _U_NOSPANDSP_
-#else
-#define _U_NOSPANDSP_ _U_
-#endif
 int
-decodeG726_32(void *input _U_NOSPANDSP_, int inputSizeBytes _U_NOSPANDSP_,
-              void *output _U_NOSPANDSP_, int *outputSizeBytes _U_NOSPANDSP_)
+decodeG726_32(void *input, int inputSizeBytes,
+              void *output, int *outputSizeBytes)
 {
-#ifdef HAVE_SPANDSP
     *outputSizeBytes = 2 * g726_decode(&state, output, (void*) input, inputSizeBytes);
-#endif
     return 0;
 }
+
+#endif