mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-12 11:26:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

Patch to remove GCC-ism for local structure initialization. From

Browse source 
Original commit message from CVS:
Patch to remove GCC-ism for local structure initialization.  From
Brian Cameron.
This commit is contained in:
David Schleef 2003-01-21 22:10:07 +00:00
parent fb27bbee37
commit ba1f005623
1 changed files with 50 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
gst/gst.c
View file

@ -190,19 +190,59 @@ gst_init_with_popt_table (int *argc, char **argv[],
gint nextopt, i, j, nstrip; gint nextopt, i, j, nstrip;
gchar **temp; gchar **temp;
const struct poptOption *options; const struct poptOption *options;
/* this is probably hacky, no? */ struct poptOption options_with[] = {
const struct poptOption options_with[] = { POPT_TABLEEND,
{NULL, NUL, POPT_ARG_INCLUDE_TABLE, poptHelpOptions, 0, "Help options:", NULL}, POPT_TABLEEND,
{NULL, NUL, POPT_ARG_INCLUDE_TABLE, (struct poptOption *) gst_init_get_popt_table(), 0, "GStreamer options:", NULL}, POPT_TABLEEND,
{NULL, NUL, POPT_ARG_INCLUDE_TABLE, (struct poptOption *) popt_options, 0, "Application options:", NULL},
POPT_TABLEEND POPT_TABLEEND
}; };
const struct poptOption options_without[] = { struct poptOption options_without[] = {
{NULL, NUL, POPT_ARG_INCLUDE_TABLE, poptHelpOptions, 0, "Help options:", NULL}, POPT_TABLEEND,
{NULL, NUL, POPT_ARG_INCLUDE_TABLE, (struct poptOption *) gst_init_get_popt_table(), 0, "GStreamer options:", NULL}, POPT_TABLEEND,
POPT_TABLEEND POPT_TABLEEND
}; };
/* This used to be done by struct initialization, but most
* compilers don't like calling functions in a struct
* initialization. (It's a GCC extension.) FIXME: This should
* be reworked to look better. */
options_with[0].longName = NULL;
options_with[0].shortName = NUL;
options_with[0].argInfo = POPT_ARG_INCLUDE_TABLE;
options_with[0].arg = poptHelpOptions;
options_with[0].val = 0;
options_with[0].descrip = "Help options:";
options_with[0].argDescrip = NULL;
options_with[1].longName = NULL;
options_with[1].shortName = NUL;
options_with[1].argInfo = POPT_ARG_INCLUDE_TABLE;
options_with[1].arg = (struct poptOption *) gst_init_get_popt_table();
options_with[1].val = 0;
options_with[1].descrip = "GStreamer options:";
options_with[1].argDescrip = NULL;
options_with[2].longName = NULL;
options_with[2].shortName = NUL;
options_with[2].argInfo = POPT_ARG_INCLUDE_TABLE;
options_with[2].arg = (struct poptOption *) popt_options;
options_with[2].val = 0;
options_with[2].descrip = "Application options:";
options_with[2].argDescrip = NULL;
options_without[0].longName = NULL;
options_without[0].shortName = NUL;
options_without[0].argInfo = POPT_ARG_INCLUDE_TABLE;
options_without[0].arg = poptHelpOptions;
options_without[0].val = 0;
options_without[0].descrip = "Help options:";
options_without[0].argDescrip = NULL;
options_without[1].longName = NULL;
options_without[1].shortName = NUL;
options_without[1].argInfo = POPT_ARG_INCLUDE_TABLE;
options_without[1].arg = (struct poptOption *) gst_init_get_popt_table();
options_without[1].val = 0;
options_without[1].descrip = "GStreamer options:";
options_without[1].argDescrip = NULL;
if (gst_initialized) if (gst_initialized)
{ {
GST_DEBUG (GST_CAT_GST_INIT, "already initialized gst\n"); GST_DEBUG (GST_CAT_GST_INIT, "already initialized gst\n");