mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-09 16:02:59 +00:00
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).
This commit is contained in:
parent
814b46b6a6
commit
c9915b767f
5 changed files with 45 additions and 18 deletions
|
@ -324,9 +324,6 @@ dnl *** checks for structures ***
|
||||||
|
|
||||||
dnl *** checks for compiler characteristics ***
|
dnl *** checks for compiler characteristics ***
|
||||||
|
|
||||||
dnl make sure we can use "inline" from C code
|
|
||||||
AC_C_INLINE
|
|
||||||
|
|
||||||
OPT_CFLAGS=
|
OPT_CFLAGS=
|
||||||
dnl Check for some compiler flags that optimize our code.
|
dnl Check for some compiler flags that optimize our code.
|
||||||
if test "x$GCC" = xyes; then
|
if test "x$GCC" = xyes; then
|
||||||
|
|
|
@ -44,7 +44,7 @@
|
||||||
#define GST_MAJORMINOR "0.10"
|
#define GST_MAJORMINOR "0.10"
|
||||||
|
|
||||||
/* package name in plugins */
|
/* package name in plugins */
|
||||||
#define GST_PACKAGE_NAME "GStreamer source release"
|
#define GST_PACKAGE_NAME "GStreamer git/prerelease"
|
||||||
|
|
||||||
/* package origin */
|
/* package origin */
|
||||||
#define GST_PACKAGE_ORIGIN "Unknown package origin"
|
#define GST_PACKAGE_ORIGIN "Unknown package origin"
|
||||||
|
@ -178,7 +178,7 @@
|
||||||
/* defined if the compiler implements __PRETTY_FUNCTION__ */
|
/* defined if the compiler implements __PRETTY_FUNCTION__ */
|
||||||
#undef HAVE_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
|
#undef HAVE_PRINTF_EXTENSION
|
||||||
|
|
||||||
/* Define to 1 if you have the <process.h> header file. */
|
/* Define to 1 if you have the <process.h> header file. */
|
||||||
|
@ -190,6 +190,12 @@
|
||||||
/* Define if RDTSC is available */
|
/* Define if RDTSC is available */
|
||||||
#undef HAVE_RDTSC
|
#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. */
|
/* Define to 1 if you have the `sigaction' function. */
|
||||||
#undef HAVE_SIGACTION
|
#undef HAVE_SIGACTION
|
||||||
|
|
||||||
|
@ -277,13 +283,13 @@
|
||||||
#define PACKAGE_NAME "GStreamer"
|
#define PACKAGE_NAME "GStreamer"
|
||||||
|
|
||||||
/* Define to the full name and version of this package. */
|
/* 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 to the one symbol short name of this package. */
|
||||||
#define PACKAGE_TARNAME "gstreamer"
|
#define PACKAGE_TARNAME "gstreamer"
|
||||||
|
|
||||||
/* Define to the version of this package. */
|
/* 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 */
|
/* directory where plugins are located */
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
|
@ -295,14 +301,11 @@
|
||||||
/* Define to 1 if you have the ANSI C header files. */
|
/* Define to 1 if you have the ANSI C header files. */
|
||||||
#undef STDC_HEADERS
|
#undef STDC_HEADERS
|
||||||
|
|
||||||
/* Define if we should use binary registry instead xml registry */
|
|
||||||
#define USE_BINARY_REGISTRY
|
|
||||||
|
|
||||||
/* Define if we should poison deallocated memory */
|
/* Define if we should poison deallocated memory */
|
||||||
#undef USE_POISONING
|
#undef USE_POISONING
|
||||||
|
|
||||||
/* Version number of package */
|
/* 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
|
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
|
||||||
significant byte first (like Motorola and SPARC, unlike Intel). */
|
significant byte first (like Motorola and SPARC, unlike Intel). */
|
||||||
|
@ -327,9 +330,3 @@
|
||||||
|
|
||||||
/* We need at least WinXP SP2 for __stat64 */
|
/* We need at least WinXP SP2 for __stat64 */
|
||||||
#undef __MSVCRT_VERSION__
|
#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
|
|
||||||
|
|
|
@ -518,6 +518,7 @@ gst_event_type_get_type (void)
|
||||||
{C_ENUM (GST_EVENT_SEEK), "GST_EVENT_SEEK", "seek"},
|
{C_ENUM (GST_EVENT_SEEK), "GST_EVENT_SEEK", "seek"},
|
||||||
{C_ENUM (GST_EVENT_NAVIGATION), "GST_EVENT_NAVIGATION", "navigation"},
|
{C_ENUM (GST_EVENT_NAVIGATION), "GST_EVENT_NAVIGATION", "navigation"},
|
||||||
{C_ENUM (GST_EVENT_LATENCY), "GST_EVENT_LATENCY", "latency"},
|
{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",
|
{C_ENUM (GST_EVENT_CUSTOM_UPSTREAM), "GST_EVENT_CUSTOM_UPSTREAM",
|
||||||
"custom-upstream"},
|
"custom-upstream"},
|
||||||
{C_ENUM (GST_EVENT_CUSTOM_DOWNSTREAM), "GST_EVENT_CUSTOM_DOWNSTREAM",
|
{C_ENUM (GST_EVENT_CUSTOM_DOWNSTREAM), "GST_EVENT_CUSTOM_DOWNSTREAM",
|
||||||
|
@ -895,6 +896,36 @@ gst_structure_change_type_get_type (void)
|
||||||
return (GType) id;
|
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" */
|
/* enumerations from "gstminiobject.h" */
|
||||||
GType
|
GType
|
||||||
gst_mini_object_flags_get_type (void)
|
gst_mini_object_flags_get_type (void)
|
||||||
|
|
|
@ -109,6 +109,8 @@ GType gst_message_type_get_type (void);
|
||||||
#define GST_TYPE_MESSAGE_TYPE (gst_message_type_get_type())
|
#define GST_TYPE_MESSAGE_TYPE (gst_message_type_get_type())
|
||||||
GType gst_structure_change_type_get_type (void);
|
GType gst_structure_change_type_get_type (void);
|
||||||
#define GST_TYPE_STRUCTURE_CHANGE_TYPE (gst_structure_change_type_get_type())
|
#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" */
|
/* enumerations from "gstminiobject.h" */
|
||||||
GType gst_mini_object_flags_get_type (void);
|
GType gst_mini_object_flags_get_type (void);
|
||||||
|
|
|
@ -64,7 +64,7 @@ G_BEGIN_DECLS
|
||||||
* The nano version of GStreamer at compile time:
|
* The nano version of GStreamer at compile time:
|
||||||
* Actual releases have 0, GIT versions have 1, prerelease versions have 2-...
|
* 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:
|
* GST_CHECK_VERSION:
|
||||||
|
|
Loading…
Reference in a new issue