From 90fdf92640f4f1e091590718cace3c87718f745e Mon Sep 17 00:00:00 2001
From: Michael Smith <msmith@xiph.org>
Date: Wed, 23 Jul 2008 22:01:20 +0000
Subject: gst/goom/: Fix build with MSVC: include glib.h to define inline
 appropriately, use header guards where needed.

Original commit message from CVS:
* gst/goom/convolve_fx.c:
* gst/goom/filters.c:
* gst/goom/goom_config.h:
* gst/goom/goom_core.c:
* gst/goom/goom_tools.h:
Fix build with MSVC: include glib.h to define inline appropriately,
use header guards where needed.
* gst/udp/gstudpnetutils.c:
* gst/udp/gstudpsrc.c:
Fix build with MSVC: use WSA* constants/functions where appropriate, use
g_snprintf rather than snprintf.
Fixes #544433.
---
 gst/goom/convolve_fx.c |  2 --
 gst/goom/filters.c     |  7 +++++++
 gst/goom/goom_config.h | 13 ++++---------
 gst/goom/goom_core.c   |  8 +++++++-
 gst/goom/goom_tools.h  |  2 ++
 5 files changed, 20 insertions(+), 12 deletions(-)

(limited to 'gst/goom')

diff --git a/gst/goom/convolve_fx.c b/gst/goom/convolve_fx.c
index 9e0498a8..e4697236 100644
--- a/gst/goom/convolve_fx.c
+++ b/gst/goom/convolve_fx.c
@@ -22,8 +22,6 @@ typedef char Motif[CONV_MOTIF_W][CONV_MOTIF_W];
 
 #define NB_THETA 512
 
-#define MAX 2.0f
-
 typedef struct _CONV_DATA
 {
   PluginParam light;
diff --git a/gst/goom/filters.c b/gst/goom/filters.c
index 9bb97c94..564e29a8 100644
--- a/gst/goom/filters.c
+++ b/gst/goom/filters.c
@@ -14,11 +14,18 @@
 
 /* #define _DEBUG_PIXEL */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
 #include <stdio.h>
+
+#ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
+#endif
 
 #include "goom_filters.h"
 #include "goom_graphic.h"
diff --git a/gst/goom/goom_config.h b/gst/goom/goom_config.h
index d44e23d1..e505882e 100644
--- a/gst/goom/goom_config.h
+++ b/gst/goom/goom_config.h
@@ -1,3 +1,5 @@
+#include <glib.h>
+
 #if WORDS_BIGENDIAN
 #define COLOR_ARGB
 #else
@@ -18,15 +20,8 @@
     #define ALPHA 0
 #endif
 
-#ifndef guint32
-#define guint8 unsigned char
-#define guin16 unsigned short
-#define guint32 unsigned int
-#define gint8 signed char
-#define gint16 signed short int
-#define gint32 signed int
-#endif
-
 #if defined (BUILD_MMX) && defined (HAVE_GCC_ASM)
+
 #define HAVE_MMX
 #endif
+
diff --git a/gst/goom/goom_core.c b/gst/goom/goom_core.c
index 0e5410e0..b1aaba59 100644
--- a/gst/goom/goom_core.c
+++ b/gst/goom/goom_core.c
@@ -7,12 +7,18 @@
  * (c)2000-2003, by iOS-software.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
+
+#ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
+#endif
 
 #include "goom.h"
 #include "goom_tools.h"
diff --git a/gst/goom/goom_tools.h b/gst/goom/goom_tools.h
index 31d044e4..08d00056 100644
--- a/gst/goom/goom_tools.h
+++ b/gst/goom/goom_tools.h
@@ -1,6 +1,8 @@
 #ifndef _GOOMTOOLS_H
 #define _GOOMTOOLS_H
 
+#include "goom_config.h"
+
 /**
  * Random number generator wrapper for faster random number.
  */
-- 
cgit