fixed to print usage and version info on STDOUT (#322502).

Tue Aug 29 13:27:33 2006  Tim Janik  <timj@gtk.org>

        * glib-mkenums.in: fixed to print usage and version info on STDOUT
        (#322502).

        * gobject.c (g_initially_unowned_init): restore ; after G_DEFINE_TYPE.
This commit is contained in:
Tim Janik 2006-08-29 11:29:24 +00:00 committed by Tim Janik
parent a66bf6e9f2
commit 08e3a830fb
3 changed files with 37 additions and 30 deletions

View File

@ -1,3 +1,10 @@
Tue Aug 29 13:27:33 2006 Tim Janik <timj@gtk.org>
* glib-mkenums.in: fixed to print usage and version info on STDOUT
(#322502).
* gobject.c (g_initially_unowned_init): restore ; after G_DEFINE_TYPE.
2006-08-26 Matthias Clasen <mclasen@redhat.com> 2006-08-26 Matthias Clasen <mclasen@redhat.com>
* gobject.c: Remove ; after G_DEFINE_TYPE. (#351741, Kjartan Maraas) * gobject.c: Remove ; after G_DEFINE_TYPE. (#351741, Kjartan Maraas)

View File

@ -117,38 +117,38 @@ sub parse_entries {
} }
sub version { sub version {
print STDERR "glib-mkenums version glib-@GLIB_VERSION@\n"; print "glib-mkenums version glib-@GLIB_VERSION@\n";
print STDERR "glib-mkenums comes with ABSOLUTELY NO WARRANTY.\n"; print "glib-mkenums comes with ABSOLUTELY NO WARRANTY.\n";
print STDERR "You may redistribute copies of glib-mkenums under the terms of\n"; print "You may redistribute copies of glib-mkenums under the terms of\n";
print STDERR "the GNU General Public License which can be found in the\n"; print "the GNU General Public License which can be found in the\n";
print STDERR "GLib source package. Sources, examples and contact\n"; print "GLib source package. Sources, examples and contact\n";
print STDERR "information are available at http://www.gtk.org\n"; print "information are available at http://www.gtk.org\n";
exit 0; exit 0;
} }
sub usage { sub usage {
print STDERR "Usage: glib-mkenums [options] [files...]\n"; print "Usage: glib-mkenums [options] [files...]\n";
print STDERR " --fhead <text> output file header\n"; print " --fhead <text> output file header\n";
print STDERR " --fprod <text> per input file production\n"; print " --fprod <text> per input file production\n";
print STDERR " --ftail <text> output file trailer\n"; print " --ftail <text> output file trailer\n";
print STDERR " --eprod <text> per enum text (produced prior to value itarations)\n"; print " --eprod <text> per enum text (produced prior to value itarations)\n";
print STDERR " --vhead <text> value header, produced before iterating over enum values\n"; print " --vhead <text> value header, produced before iterating over enum values\n";
print STDERR " --vprod <text> value text, produced for each enum value\n"; print " --vprod <text> value text, produced for each enum value\n";
print STDERR " --vtail <text> value tail, produced after iterating over enum values\n"; print " --vtail <text> value tail, produced after iterating over enum values\n";
print STDERR " --comments <text> comment structure\n"; print " --comments <text> comment structure\n";
print STDERR " --template file template file\n"; print " --template file template file\n";
print STDERR " -h, --help show this help message\n"; print " -h, --help show this help message\n";
print STDERR " -v, --version print version informations\n"; print " -v, --version print version informations\n";
print STDERR "Production text substitutions:\n"; print "Production text substitutions:\n";
print STDERR " \@EnumName\@ PrefixTheXEnum\n"; print " \@EnumName\@ PrefixTheXEnum\n";
print STDERR " \@enum_name\@ prefix_the_xenum\n"; print " \@enum_name\@ prefix_the_xenum\n";
print STDERR " \@ENUMNAME\@ PREFIX_THE_XENUM\n"; print " \@ENUMNAME\@ PREFIX_THE_XENUM\n";
print STDERR " \@ENUMSHORT\@ THE_XENUM\n"; print " \@ENUMSHORT\@ THE_XENUM\n";
print STDERR " \@VALUENAME\@ PREFIX_THE_XVALUE\n"; print " \@VALUENAME\@ PREFIX_THE_XVALUE\n";
print STDERR " \@valuenick\@ the-xvalue\n"; print " \@valuenick\@ the-xvalue\n";
print STDERR " \@type\@ either enum or flags\n"; print " \@type\@ either enum or flags\n";
print STDERR " \@Type\@ either Enum or Flags\n"; print " \@Type\@ either Enum or Flags\n";
print STDERR " \@TYPE\@ either ENUM or FLAGS\n"; print " \@TYPE\@ either ENUM or FLAGS\n";
print STDERR " \@filename\@ name of current input file\n"; print " \@filename\@ name of current input file\n";
exit 0; exit 0;
} }

View File

@ -2242,7 +2242,7 @@ g_object_compat_control (gsize what,
} }
} }
G_DEFINE_TYPE (GInitiallyUnowned, g_initially_unowned, G_TYPE_OBJECT) G_DEFINE_TYPE (GInitiallyUnowned, g_initially_unowned, G_TYPE_OBJECT);
static void static void
g_initially_unowned_init (GInitiallyUnowned *object) g_initially_unowned_init (GInitiallyUnowned *object)