diff options
author | Michael Smith <msmith@xiph.org> | 2008-07-23 22:01:20 +0000 |
---|---|---|
committer | Michael Smith <msmith@xiph.org> | 2008-07-23 22:01:20 +0000 |
commit | 90fdf92640f4f1e091590718cace3c87718f745e (patch) | |
tree | 26a2cc96d0cc1a2a6ea458e0e78a4dc44d55252a /gst/goom | |
parent | da2d6b62e9a289de0d11283b740d314fa09a6d4f (diff) |
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.
Diffstat (limited to 'gst/goom')
-rw-r--r-- | gst/goom/convolve_fx.c | 2 | ||||
-rw-r--r-- | gst/goom/filters.c | 7 | ||||
-rw-r--r-- | gst/goom/goom_config.h | 13 | ||||
-rw-r--r-- | gst/goom/goom_core.c | 8 | ||||
-rw-r--r-- | gst/goom/goom_tools.h | 2 |
5 files changed, 20 insertions, 12 deletions
diff --git a/gst/goom/convolve_fx.c b/gst/goom/convolve_fx.c index 9e0498a83..e46972360 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 9bb97c944..564e29a87 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 d44e23d18..e505882e2 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 0e5410e0f..b1aaba593 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 31d044e4a..08d000567 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. */ |