mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 15:27:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

printf: fix alloca use for windows with mingw32

Browse source 
Don't use just GLIB_HAVE_ALLOCA_H to check if alloca is available,
that's just for the header. GLib may define alloca for us otherwise
too irrespective of GLIB_HAVE_ALLOCA_H.

Fixes compiler warning with mingw32:
gst/printf/vasnprintf.c:73:0: warning: "alloca" redefined
This commit is contained in:
Tim-Philipp Müller 2013-04-08 19:42:27 +01:00
parent ff292d530c
commit 3c1d9c6d41
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/printf/README
View file

@ -47,8 +47,8 @@ This was imported from GLib's gnulib subdirectory.
g-gnulib.h and _g_gnulib namespace has been changed to gst-printf.h and g-gnulib.h and _g_gnulib namespace has been changed to gst-printf.h and
__gst_printf namespace for GStreamer. Also #define HAVE_SNPRINTF 0 has __gst_printf namespace for GStreamer. Also #define HAVE_SNPRINTF 0 has
been changed to #undef HAVE_SNPRINTF, and HAVE_ALLOCA has been changed to been changed to #undef HAVE_SNPRINTF, and HAVE_ALLOCA has been replaced
GLIB_HAVE_ALLOCA_H by an #if defined(alloca) || defined(GLIB_HAVE_ALLOCA_H)
printf-extension.[ch] were added to provide support for custom pointer printf-extension.[ch] were added to provide support for custom pointer
arguments (e.g. caps, events, etc.) arguments (e.g. caps, events, etc.)

2
gst/printf/vasnprintf.c
View file

@ -67,7 +67,7 @@ local_wcslen (const wchar_t * s)
/* For those losing systems which don't have 'alloca' we have to add /* For those losing systems which don't have 'alloca' we have to add
some additional code emulating it. */ some additional code emulating it. */
#ifdef GLIB_HAVE_ALLOCA_H #if defined (alloca) || defined (GLIB_HAVE_ALLOCA_H)
# define freea(p) /* nothing */ # define freea(p) /* nothing */
#else #else
# define alloca(n) malloc (n) # define alloca(n) malloc (n)