From c9915b767faf5d3bd24929f5fe803131b1e18b3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 4 Jun 2009 19:44:38 +0100 Subject: [PATCH] configure: remove AC_C_INLINE and update win32 files to git Remove AC_C_INLINE check, so we don't end up with an #undef inline in config.h, which causes problems with some versions of MSCV apparently. GLib defines inline for us in a suitable way already anyway. Fixes #584835. While we're at it, also update the other win32 files to git (bump version, add new defines and enums). --- configure.ac | 3 --- win32/common/config.h | 25 +++++++++++-------------- win32/common/gstenumtypes.c | 31 +++++++++++++++++++++++++++++++ win32/common/gstenumtypes.h | 2 ++ win32/common/gstversion.h | 2 +- 5 files changed, 45 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index 9a6bec2856..87793e142c 100644 --- a/configure.ac +++ b/configure.ac @@ -324,9 +324,6 @@ dnl *** checks for structures *** dnl *** checks for compiler characteristics *** -dnl make sure we can use "inline" from C code -AC_C_INLINE - OPT_CFLAGS= dnl Check for some compiler flags that optimize our code. if test "x$GCC" = xyes; then diff --git a/win32/common/config.h b/win32/common/config.h index 2044e402bb..a66013fd4e 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -44,7 +44,7 @@ #define GST_MAJORMINOR "0.10" /* package name in plugins */ -#define GST_PACKAGE_NAME "GStreamer source release" +#define GST_PACKAGE_NAME "GStreamer git/prerelease" /* package origin */ #define GST_PACKAGE_ORIGIN "Unknown package origin" @@ -178,7 +178,7 @@ /* defined if the compiler implements __PRETTY_FUNCTION__ */ #undef HAVE_PRETTY_FUNCTION -/* Defined if we have register_printf_function () */ +/* Defined if we have printf specifier extensions available */ #undef HAVE_PRINTF_EXTENSION /* Define to 1 if you have the header file. */ @@ -190,6 +190,12 @@ /* Define if RDTSC is available */ #undef HAVE_RDTSC +/* Define to 1 if you have the `register_printf_function' function. */ +#undef HAVE_REGISTER_PRINTF_FUNCTION + +/* Define to 1 if you have the `register_printf_specifier' function. */ +#undef HAVE_REGISTER_PRINTF_SPECIFIER + /* Define to 1 if you have the `sigaction' function. */ #undef HAVE_SIGACTION @@ -277,13 +283,13 @@ #define PACKAGE_NAME "GStreamer" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GStreamer 0.10.23" +#define PACKAGE_STRING "GStreamer 0.10.23.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gstreamer" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.10.23" +#define PACKAGE_VERSION "0.10.23.1" /* directory where plugins are located */ #ifdef _DEBUG @@ -295,14 +301,11 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -/* Define if we should use binary registry instead xml registry */ -#define USE_BINARY_REGISTRY - /* Define if we should poison deallocated memory */ #undef USE_POISONING /* Version number of package */ -#define VERSION "0.10.23" +#define VERSION "0.10.23.1" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ @@ -327,9 +330,3 @@ /* We need at least WinXP SP2 for __stat64 */ #undef __MSVCRT_VERSION__ - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -#undef inline -#endif diff --git a/win32/common/gstenumtypes.c b/win32/common/gstenumtypes.c index d4e9de799b..24e9826bc9 100644 --- a/win32/common/gstenumtypes.c +++ b/win32/common/gstenumtypes.c @@ -518,6 +518,7 @@ gst_event_type_get_type (void) {C_ENUM (GST_EVENT_SEEK), "GST_EVENT_SEEK", "seek"}, {C_ENUM (GST_EVENT_NAVIGATION), "GST_EVENT_NAVIGATION", "navigation"}, {C_ENUM (GST_EVENT_LATENCY), "GST_EVENT_LATENCY", "latency"}, + {C_ENUM (GST_EVENT_STEP), "GST_EVENT_STEP", "step"}, {C_ENUM (GST_EVENT_CUSTOM_UPSTREAM), "GST_EVENT_CUSTOM_UPSTREAM", "custom-upstream"}, {C_ENUM (GST_EVENT_CUSTOM_DOWNSTREAM), "GST_EVENT_CUSTOM_DOWNSTREAM", @@ -895,6 +896,36 @@ gst_structure_change_type_get_type (void) return (GType) id; } +GType +gst_stream_status_type_get_type (void) +{ + static gsize id = 0; + static const GEnumValue values[] = { + {C_ENUM (GST_STREAM_STATUS_TYPE_CREATE), "GST_STREAM_STATUS_TYPE_CREATE", + "create"}, + {C_ENUM (GST_STREAM_STATUS_TYPE_ENTER), "GST_STREAM_STATUS_TYPE_ENTER", + "enter"}, + {C_ENUM (GST_STREAM_STATUS_TYPE_LEAVE), "GST_STREAM_STATUS_TYPE_LEAVE", + "leave"}, + {C_ENUM (GST_STREAM_STATUS_TYPE_DESTROY), "GST_STREAM_STATUS_TYPE_DESTROY", + "destroy"}, + {C_ENUM (GST_STREAM_STATUS_TYPE_START), "GST_STREAM_STATUS_TYPE_START", + "start"}, + {C_ENUM (GST_STREAM_STATUS_TYPE_PAUSE), "GST_STREAM_STATUS_TYPE_PAUSE", + "pause"}, + {C_ENUM (GST_STREAM_STATUS_TYPE_STOP), "GST_STREAM_STATUS_TYPE_STOP", + "stop"}, + {0, NULL, NULL} + }; + + if (g_once_init_enter (&id)) { + GType tmp = g_enum_register_static ("GstStreamStatusType", values); + g_once_init_leave (&id, tmp); + } + + return (GType) id; +} + /* enumerations from "gstminiobject.h" */ GType gst_mini_object_flags_get_type (void) diff --git a/win32/common/gstenumtypes.h b/win32/common/gstenumtypes.h index 2c87789d10..29b741f9da 100644 --- a/win32/common/gstenumtypes.h +++ b/win32/common/gstenumtypes.h @@ -109,6 +109,8 @@ GType gst_message_type_get_type (void); #define GST_TYPE_MESSAGE_TYPE (gst_message_type_get_type()) GType gst_structure_change_type_get_type (void); #define GST_TYPE_STRUCTURE_CHANGE_TYPE (gst_structure_change_type_get_type()) +GType gst_stream_status_type_get_type (void); +#define GST_TYPE_STREAM_STATUS_TYPE (gst_stream_status_type_get_type()) /* enumerations from "gstminiobject.h" */ GType gst_mini_object_flags_get_type (void); diff --git a/win32/common/gstversion.h b/win32/common/gstversion.h index 6c7ff3a708..71537485f8 100644 --- a/win32/common/gstversion.h +++ b/win32/common/gstversion.h @@ -64,7 +64,7 @@ G_BEGIN_DECLS * The nano version of GStreamer at compile time: * Actual releases have 0, GIT versions have 1, prerelease versions have 2-... */ -#define GST_VERSION_NANO (0) +#define GST_VERSION_NANO (1) /** * GST_CHECK_VERSION: