diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-09-24 00:13:51 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-09-24 00:23:22 +0100 |
| commit | 8834567cd46af2f501898a6c9a5944e093b1bc15 (patch) | |
| tree | 2ec0f37214b7fd6fbf50593d84219455b50f261b | |
| parent | 73076c89abc503f5e56b83ec37960d58e3222fe1 (diff) | |
win32: define GST_PACKAGE_RELEASE_DATETIME in win32 config.h as well
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | win32/common/config.h | 9 | ||||
| -rw-r--r-- | win32/common/gstenumtypes.c | 4 | ||||
| -rw-r--r-- | win32/common/gstenumtypes.h | 4 | ||||
| -rw-r--r-- | win32/common/gstmarshal.c | 2 |
5 files changed, 15 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index be99576267..108538c31e 100644 --- a/configure.ac +++ b/configure.ac @@ -796,6 +796,7 @@ sed \ -e 's/.* GST_MAJORMINOR$/#define GST_MAJORMINOR "'$GST_MAJORMINOR'"/' \ -e "s,.* GST_PACKAGE_NAME$,#define GST_PACKAGE_NAME \"${GST_PACKAGE_NAME}\"," \ -e 's/.* GST_PACKAGE_ORIGIN$/#define GST_PACKAGE_ORIGIN "Unknown package origin"/' \ + -e "s,.* GST_PACKAGE_RELEASE_DATETIME$,#define GST_PACKAGE_RELEASE_DATETIME \"${GST_PACKAGE_RELEASE_DATETIME}\"," \ -e 's/.* HAVE_CPU_I386$/#define HAVE_CPU_I386 1/' \ -e 's/.* HAVE_FGETPOS$/#define HAVE_FGETPOS 1/' \ -e 's/.* HAVE_FSETPOS$/#define HAVE_FSETPOS 1/' \ diff --git a/win32/common/config.h b/win32/common/config.h index dd4aaa992c..65083d7c68 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -64,6 +64,9 @@ /* package origin */ #define GST_PACKAGE_ORIGIN "Unknown package origin" +/* GStreamer package release date/time for plugins as YYYY-MM-DD */ +#define GST_PACKAGE_RELEASE_DATETIME "2010-09-23T23:20Z" + /* location of the installed gst-plugin-scanner */ #define GST_PLUGIN_SCANNER_INSTALLED LIBDIR "\\gst-plugin-scanner" @@ -157,6 +160,9 @@ /* Have GMP library */ #undef HAVE_GMP +/* Define to 1 if you have the `gmtime_r' function. */ +#undef HAVE_GMTIME_R + /* Have GSL library */ #undef HAVE_GSL @@ -274,6 +280,9 @@ /* Define to 1 if you have the <sys/wait.h> header file. */ #undef HAVE_SYS_WAIT_H +/* Have tm_gmtoff field in struct tm */ +#undef HAVE_TM_GMTOFF + /* Define to 1 if you have the <ucontext.h> header file. */ #undef HAVE_UCONTEXT_H diff --git a/win32/common/gstenumtypes.c b/win32/common/gstenumtypes.c index ae7b641327..6962941211 100644 --- a/win32/common/gstenumtypes.c +++ b/win32/common/gstenumtypes.c @@ -1,5 +1,5 @@ -/* Generated data (by glib-mkenums) */ + #include "gst_private.h" #include <gst/gst.h> @@ -1530,5 +1530,3 @@ gst_parse_flags_get_type (void) return (GType) id; } - -/* Generated data ends here */ diff --git a/win32/common/gstenumtypes.h b/win32/common/gstenumtypes.h index 3dfb07a108..2e19727556 100644 --- a/win32/common/gstenumtypes.h +++ b/win32/common/gstenumtypes.h @@ -1,5 +1,5 @@ -/* Generated data (by glib-mkenums) */ + #ifndef __GST_ENUM_TYPES_H__ #define __GST_ENUM_TYPES_H__ @@ -201,5 +201,5 @@ G_END_DECLS #endif /* __GST_ENUM_TYPES_H__ */ -/* Generated data ends here */ + diff --git a/win32/common/gstmarshal.c b/win32/common/gstmarshal.c index a7081239d2..b54470a247 100644 --- a/win32/common/gstmarshal.c +++ b/win32/common/gstmarshal.c @@ -24,6 +24,7 @@ #define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) #define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) #define g_marshal_value_peek_object(v) g_value_get_object (v) +#define g_marshal_value_peek_variant(v) g_value_get_variant (v) #else /* !G_ENABLE_DEBUG */ /* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. * Do not access GValues directly in your code. Instead, use the @@ -47,6 +48,7 @@ #define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer #define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer #define g_marshal_value_peek_object(v) (v)->data[0].v_pointer +#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer #endif /* !G_ENABLE_DEBUG */ |