Tag arguments to decodeXXX routines as unused iff we don't support the
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 30 Nov 2013 22:16:09 +0000 (22:16 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 30 Nov 2013 22:16:09 +0000 (22:16 +0000)
codec.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@53680 f5534014-38df-0310-8fa8-9805f1628bb7

codecs/G722/G722decode.c
codecs/G726/G726decode.c

index 2286bd0a6150136eae09fb5701d78ad3808fb2ed..73bc10dbc8fe1f7d8abc95f87e9b1b737d87152c 100644 (file)
@@ -22,6 +22,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <glib.h>
 
 #ifdef HAVE_SPANDSP
@@ -43,8 +45,14 @@ initG722(void)
 #endif
 }
 
+#ifdef HAVE_SPANDSP
+#define _U_NOSPANDSP_
+#else
+#define _U_NOSPANDSP_ _U_
+#endif
 int
-decodeG722(void *input, int inputSizeBytes, void *output, int *outputSizeBytes)
+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);
index d97e386272390838f1cc0cfc827446810c8cac66..edc337840ff999309170840bde087004daf58fa0 100644 (file)
@@ -22,6 +22,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <glib.h>
 #ifdef HAVE_SPANDSP
 #include "telephony.h"
@@ -49,8 +51,14 @@ void initG726_32(void)
 /* 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, int inputSizeBytes, void *output, int *outputSizeBytes)
+decodeG726_32(void *input _U_NOSPANDSP_, int inputSizeBytes _U_NOSPANDSP_,
+              void *output _U_NOSPANDSP_, int *outputSizeBytes _U_NOSPANDSP_)
 {
 #ifdef HAVE_SPANDSP
     *outputSizeBytes = 2 * g726_decode(&state, output, (void*) input, inputSizeBytes);