From dba80e1cf536f9edd15225f1975173804848b348 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 21 Mar 2005 12:55:45 +0000 Subject: [PATCH] a G_GNUC_CONST function is not allowed to change global memory, so it is not suited for _get_type() functions. Original commit message from CVS: a G_GNUC_CONST function is not allowed to change global memory, so it is not suited for _get_type() functions. Backport Makefile addition from HEAD. --- ChangeLog | 12 ++++++++++++ gst/gstcaps.h | 2 +- gst/gstdata.h | 2 +- gst/gstprobe.h | 2 +- gst/gststructure.h | 2 +- gst/gsttaginterface.h | 2 +- gst/gsttagsetter.h | 2 +- gst/schedulers/Makefile.am | 2 ++ 8 files changed, 20 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 73e59145aa..d4cb1c546a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2005-03-21 Wim Taymans + + * gst/gstcaps.h: + * gst/gstdata.h: + * gst/gstprobe.h: + * gst/gststructure.h: + * gst/gsttaginterface.h: + * gst/schedulers/Makefile.am: + a G_GNUC_CONST function is not allowed to change global + memory, so it is not suited for _get_type() functions. + Backport Makefile addition from HEAD. + 2005-03-21 Wim Taymans * gst/Makefile.am: diff --git a/gst/gstcaps.h b/gst/gstcaps.h index e0c21f7e5d..5943223522 100644 --- a/gst/gstcaps.h +++ b/gst/gstcaps.h @@ -81,7 +81,7 @@ struct _GstStaticCaps { gpointer _gst_reserved[GST_PADDING]; }; -GType gst_caps_get_type (void) G_GNUC_CONST; +GType gst_caps_get_type (void); GstCaps * gst_caps_new_empty (void); GstCaps * gst_caps_new_any (void); GstCaps * gst_caps_new_simple (const char *media_type, diff --git a/gst/gstdata.h b/gst/gstdata.h index 9cd447b2b4..de13f85581 100644 --- a/gst/gstdata.h +++ b/gst/gstdata.h @@ -102,7 +102,7 @@ GstData* gst_data_ref_by_count (GstData* data, gint count); void gst_data_unref (GstData* data); /* GType for GstData */ -GType gst_data_get_type (void) G_GNUC_CONST; +GType gst_data_get_type (void); G_END_DECLS diff --git a/gst/gstprobe.h b/gst/gstprobe.h index 326fe96154..99235eab68 100644 --- a/gst/gstprobe.h +++ b/gst/gstprobe.h @@ -34,7 +34,7 @@ G_BEGIN_DECLS typedef struct _GstProbe GstProbe; -GType gst_probe_get_type (void) G_GNUC_CONST; +GType gst_probe_get_type (void); /* the callback should return FALSE if the data should be discarded */ typedef gboolean (*GstProbeCallback) (GstProbe *probe, diff --git a/gst/gststructure.h b/gst/gststructure.h index 1fa05531e0..8cdb33f63a 100644 --- a/gst/gststructure.h +++ b/gst/gststructure.h @@ -54,7 +54,7 @@ struct _GstStructure { gpointer _gst_reserved[GST_PADDING]; }; -GType gst_structure_get_type (void) G_GNUC_CONST; +GType gst_structure_get_type (void); GstStructure * gst_structure_empty_new (const gchar * name); GstStructure * gst_structure_id_empty_new (GQuark quark); diff --git a/gst/gsttaginterface.h b/gst/gsttaginterface.h index f28f431c17..eaf494076d 100644 --- a/gst/gsttaginterface.h +++ b/gst/gsttaginterface.h @@ -46,7 +46,7 @@ struct _GstTagSetterIFace /* virtual table */ }; -GType gst_tag_setter_get_type (void) G_GNUC_CONST; +GType gst_tag_setter_get_type (void); void gst_tag_setter_merge (GstTagSetter * setter, const GstTagList * list, diff --git a/gst/gsttagsetter.h b/gst/gsttagsetter.h index f28f431c17..eaf494076d 100644 --- a/gst/gsttagsetter.h +++ b/gst/gsttagsetter.h @@ -46,7 +46,7 @@ struct _GstTagSetterIFace /* virtual table */ }; -GType gst_tag_setter_get_type (void) G_GNUC_CONST; +GType gst_tag_setter_get_type (void); void gst_tag_setter_merge (GstTagSetter * setter, const GstTagList * list, diff --git a/gst/schedulers/Makefile.am b/gst/schedulers/Makefile.am index 4d7ee1a3ae..d581bbca85 100644 --- a/gst/schedulers/Makefile.am +++ b/gst/schedulers/Makefile.am @@ -15,6 +15,8 @@ if AS_LIBTOOL_WIN32 as_libtool_noinst_DATA_files = $(AS_LIBTOOL_LIB).lib +as_libtool_LDFLAGS = -no-undefined + # depend on this in install-data-local as-libtool-install-data-local: for i in $(AS_LIBTOOL_LIBS); do \