From c76e72a7f548faccf5aa7a4a6c1b4cd2b545cd55 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Wed, 17 Mar 2010 21:33:28 +0100
Subject: [PATCH] Add -Wundef to configure flags

and fix the resulting warnings
---
 configure.ac                 |  4 ++--
 ext/jpeg/gstjpegenc.c        | 10 +++++-----
 ext/speex/gstspeexenc.h      |  2 +-
 gst/goom/goom_config.h       |  2 +-
 gst/goom/mathtools.h         |  3 ++-
 tests/check/elements/level.c |  2 +-
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index d470f173ea..7febfdae97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -272,10 +272,10 @@ dnl set location of plugin directory
 AG_GST_SET_PLUGINDIR
 
 dnl define an ERROR_CFLAGS Makefile variable
-AG_GST_SET_ERROR_CFLAGS($GST_GIT, [-Wmissing-declarations -Wmissing-prototypes -Wredundant-decls])
+AG_GST_SET_ERROR_CFLAGS($GST_GIT, [-Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wundef])
 
 dnl define an ERROR_CXXFLAGS Makefile variable
-AG_GST_SET_ERROR_CXXFLAGS($GST_GIT, [-Wmissing-declarations -Wredundant-decls])
+AG_GST_SET_ERROR_CXXFLAGS($GST_GIT, [-Wmissing-declarations -Wredundant-decls -Wundef])
 
 dnl define correct level for debugging messages
 AG_GST_SET_LEVEL_DEFAULT($GST_GIT)
diff --git a/ext/jpeg/gstjpegenc.c b/ext/jpeg/gstjpegenc.c
index 37c0940f9e..38e2398dd3 100644
--- a/ext/jpeg/gstjpegenc.c
+++ b/ext/jpeg/gstjpegenc.c
@@ -187,7 +187,7 @@ gst_jpegenc_class_init (GstJpegEnc * klass)
       g_param_spec_int ("quality", "Quality", "Quality of encoding",
           0, 100, JPEG_DEFAULT_QUALITY, G_PARAM_READWRITE));
 
-#if ENABLE_SMOOTHING
+#ifdef ENABLE_SMOOTHING
   /* disabled, since it doesn't seem to work */
   g_object_class_install_property (gobject_class, PROP_SMOOTHING,
       g_param_spec_int ("smoothing", "Smoothing", "Smoothing factor",
@@ -416,7 +416,7 @@ gst_jpegenc_resync (GstJpegEnc * jpegenc)
 
   GST_DEBUG_OBJECT (jpegenc, "width %d, height %d", width, height);
 
-#if ENABLE_COLORSPACE_RGB
+#ifdef ENABLE_COLORSPACE_RGB
   switch (jpegenc->format) {
     case GST_COLORSPACE_RGB24:
       jpegenc->bufsize = jpegenc->width * jpegenc->height * 3;
@@ -450,7 +450,7 @@ gst_jpegenc_resync (GstJpegEnc * jpegenc)
       }
 
       GST_DEBUG_OBJECT (jpegenc, "setting format done");
-#if ENABLE_COLORSPACE_RGB
+#ifdef ENABLE_COLORSPACE_RGB
       break;
     default:
       printf ("gst_jpegenc_resync: unsupported colorspace, using RGB\n");
@@ -581,7 +581,7 @@ gst_jpegenc_set_property (GObject * object, guint prop_id,
     case PROP_QUALITY:
       jpegenc->quality = g_value_get_int (value);
       break;
-#if ENABLE_SMOOTHING
+#ifdef ENABLE_SMOOTHING
     case PROP_SMOOTHING:
       jpegenc->smoothing = g_value_get_int (value);
       break;
@@ -609,7 +609,7 @@ gst_jpegenc_get_property (GObject * object, guint prop_id, GValue * value,
     case PROP_QUALITY:
       g_value_set_int (value, jpegenc->quality);
       break;
-#if ENABLE_SMOOTHING
+#ifdef ENABLE_SMOOTHING
     case PROP_SMOOTHING:
       g_value_set_int (value, jpegenc->smoothing);
       break;
diff --git a/ext/speex/gstspeexenc.h b/ext/speex/gstspeexenc.h
index 99e0086b2d..2e73829f34 100644
--- a/ext/speex/gstspeexenc.h
+++ b/ext/speex/gstspeexenc.h
@@ -67,7 +67,7 @@ struct _GstSpeexEnc {
 
   SpeexBits             bits;
   SpeexHeader           header;
-#if SPEEX_1_0
+#ifdef SPEEX_1_0
   SpeexMode             *speex_mode;
 #else
   const SpeexMode       *speex_mode;
diff --git a/gst/goom/goom_config.h b/gst/goom/goom_config.h
index 1098431c3c..8daa1d6d8d 100644
--- a/gst/goom/goom_config.h
+++ b/gst/goom/goom_config.h
@@ -18,7 +18,7 @@
  */
 #include <glib.h>
 
-#if WORDS_BIGENDIAN
+#if G_BYTE_ORDER == G_BIG_ENDIAN
 #define COLOR_ARGB
 #else
 #define COLOR_BGRA
diff --git a/gst/goom/mathtools.h b/gst/goom/mathtools.h
index a123f4852b..baf79b0183 100644
--- a/gst/goom/mathtools.h
+++ b/gst/goom/mathtools.h
@@ -22,13 +22,14 @@
  #ifndef MATHTOOLS_H
 #define MATHTOOLS_H
 
+#include <glib.h>
 
 #define _double2fixmagic (68719476736.0*1.5)
 /* 2^36 * 1.5,  (52-_shiftamt=36) uses limited precisicion to floor */
 #define _shiftamt 16
 /* 16.16 fixed point representation */
 
-#if BigEndian_
+#if G_BYTE_ORDER == G_BIG_ENDIAN
 #define iexp_				0
 #define iman_				1
 #else
diff --git a/tests/check/elements/level.c b/tests/check/elements/level.c
index 838b872354..0cd8fb67b1 100644
--- a/tests/check/elements/level.c
+++ b/tests/check/elements/level.c
@@ -258,7 +258,7 @@ GST_START_TEST (test_int16_panned)
     GST_DEBUG ("%s[0] is %lf", fields[j], dB);
 #ifdef HAVE_ISINF
     fail_unless (isinf (dB));
-#elif HAVE_FPCLASS
+#elif defined (HAVE_FPCLASS)
     fail_unless (fpclass (dB) == FP_NINF);
 #endif
   }