diff options
| author | David Schleef <ds@schleef.org> | 2003-12-22 01:39:35 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2003-12-22 01:39:35 +0000 |
| commit | 8c9cd079d4f9a516ca52b2c44432ab8f3b19ec71 (patch) | |
| tree | f59378894f2eb1186291d5dd566d10ca34774715 /gst/gstplugin.h | |
| parent | 54b3850775db36acf0fabbe89861592647b86af4 (diff) | |
Merge CAPS branch
Original commit message from CVS:
Merge CAPS branch
Diffstat (limited to 'gst/gstplugin.h')
| -rw-r--r-- | gst/gstplugin.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/gst/gstplugin.h b/gst/gstplugin.h index fa2510ccc..8d31d29b0 100644 --- a/gst/gstplugin.h +++ b/gst/gstplugin.h @@ -80,8 +80,7 @@ struct _GstPlugin { gpointer _gst_reserved[GST_PADDING]; }; -#ifndef GST_PLUGIN_STATIC -#define GST_PLUGIN_DEFINE_DYNAMIC(major,minor,name,description,init,version,license,package,origin) \ +#define GST_PLUGIN_DEFINE(major,minor,name,description,init,version,license,package,origin) \ GstPluginDesc gst_plugin_desc = { \ major, \ minor, \ @@ -93,11 +92,9 @@ GstPluginDesc gst_plugin_desc = { \ license, \ package, \ origin, \ - GST_PADDING_INIT \ -}; -#define GST_PLUGIN_DEFINE_STATIC(major,minor,name,description,init,version,license,package,origin) -#else -#define GST_PLUGIN_DEFINE_DYNAMIC(major,minor,name,description,init,version,license,package,origin) + GST_PADDING_INIT \ +}; + #define GST_PLUGIN_DEFINE_STATIC(major,minor,name,description,init,version,license,package,origin) \ static void GST_GNUC_CONSTRUCTOR \ _gst_plugin_static_init__ ##init (void) \ @@ -117,12 +114,7 @@ _gst_plugin_static_init__ ##init (void) \ }; \ _gst_plugin_register_static (&plugin_desc_); \ } -#endif -#define GST_PLUGIN_DEFINE(major,minor,name,description,init,version,license,package,origin)\ - GST_PLUGIN_DEFINE_STATIC(major,minor,name,description,init,version,license,package,origin)\ - GST_PLUGIN_DEFINE_DYNAMIC(major,minor,name,description,init,version,license,package,origin) - #define GST_LICENSE_UNKNOWN "unknown" |