ruby-changes:22750
From: akr <ko1@a...>
Date: Sat, 25 Feb 2012 11:09:34 +0900 (JST)
Subject: [ruby-changes:22750] akr:r34799 (trunk): * ext/curses/curses.c (Init_curses): use rb_define_const once for
akr 2012-02-25 11:09:22 +0900 (Sat, 25 Feb 2012) New Revision: 34799 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34799 Log: * ext/curses/curses.c (Init_curses): use rb_define_const once for Curses::VERSION. * ext/dbm/dbm.c (Init_dbm): ditto for DBM::VERSION. Modified files: trunk/ChangeLog trunk/ext/curses/curses.c trunk/ext/dbm/dbm.c Index: ChangeLog =================================================================== --- ChangeLog (revision 34798) +++ ChangeLog (revision 34799) @@ -1,3 +1,10 @@ +Sat Feb 25 11:08:28 2012 Tanaka Akira <akr@f...> + + * ext/curses/curses.c (Init_curses): use rb_define_const once for + Curses::VERSION. + + * ext/dbm/dbm.c (Init_dbm): ditto for DBM::VERSION. + Sat Feb 25 10:34:22 2012 Tanaka Akira <akr@f...> * ext/curses/curses.c (Init_curses): make Curses::VERSION Index: ext/curses/curses.c =================================================================== --- ext/curses/curses.c (revision 34798) +++ ext/curses/curses.c (revision 34799) @@ -2768,20 +2768,22 @@ rb_define_module_function(mCurses, "def_prog_mode", curses_def_prog_mode, 0); rb_define_module_function(mCurses, "reset_prog_mode", curses_reset_prog_mode, 0); + { + VALUE version; #if defined(HAVE_FUNC_CURSES_VERSION) - /* ncurses and PDcurses */ - rb_define_const(mCurses, "VERSION", rb_str_new2(curses_version())); + /* ncurses and PDcurses */ + version = rb_str_new2(curses_version()); #elif defined(HAVE_VAR_CURSES_VERSION) - { /* SVR4 curses has an undocumented and undeclared variable, curses_version. * It contains a string, "SVR4". */ RUBY_EXTERN char *curses_version; - rb_define_const(mCurses, "VERSION", rb_sprintf("curses (%s)", curses_version)); - } + version = rb_sprintf("curses (%s)", curses_version); #else - /* BSD curses, perhaps. NetBSD 5 still use it. */ - rb_define_const(mCurses, "VERSION", rb_str_new2("curses (unknown)")); + /* BSD curses, perhaps. NetBSD 5 still use it. */ + version = rb_str_new2("curses (unknown)"); #endif + rb_define_const(mCurses, "VERSION", version); + } /* * Document-class: Curses::Window Index: ext/dbm/dbm.c =================================================================== --- ext/dbm/dbm.c (revision 34798) +++ ext/dbm/dbm.c (revision 34799) @@ -1085,36 +1085,38 @@ */ rb_define_const(rb_cDBM, "NEWDB", INT2FIX(O_RDWR|O_CREAT|O_TRUNC|RUBY_DBM_RW_BIT)); + { + VALUE version; #if defined(_DBM_IOERR) - rb_define_const(rb_cDBM, "VERSION", rb_str_new2("ndbm (4.3BSD)")); + version = rb_str_new2("ndbm (4.3BSD)"); #elif defined(RUBYDBM_GDBM_HEADER) # if defined(HAVE_DECLARED_LIBVAR_GDBM_VERSION) - /* since gdbm 1.9 */ - rb_define_const(rb_cDBM, "VERSION", rb_str_new2(gdbm_version)); + /* since gdbm 1.9 */ + version = rb_str_new2(gdbm_version); # elif defined(HAVE_UNDECLARED_LIBVAR_GDBM_VERSION) - /* ndbm.h doesn't declare gdbm_version until gdbm 1.8.3. - * See extconf.rb for more information. */ - { - RUBY_EXTERN char *gdbm_version; - rb_define_const(rb_cDBM, "VERSION", rb_str_new2(gdbm_version)); - } + /* ndbm.h doesn't declare gdbm_version until gdbm 1.8.3. + * See extconf.rb for more information. */ + RUBY_EXTERN char *gdbm_version; + version = rb_str_new2(gdbm_version); # else - rb_define_const(rb_cDBM, "VERSION", rb_str_new2("GDBM (unknown)")); + version = rb_str_new2("GDBM (unknown)"); # endif #elif defined(RUBYDBM_DB_HEADER) # if defined(HAVE_DB_VERSION) - /* The version of the dbm library, if using Berkeley DB */ - rb_define_const(rb_cDBM, "VERSION", rb_str_new2(db_version(NULL, NULL, NULL))); + /* The version of the dbm library, if using Berkeley DB */ + version = rb_str_new2(db_version(NULL, NULL, NULL)); # else - rb_define_const(rb_cDBM, "VERSION", rb_str_new2("Berkeley DB (unknown)")); + version = rb_str_new2("Berkeley DB (unknown)"); # endif #elif defined(_RELIC_H) # if defined(HAVE_DPVERSION) - rb_define_const(rb_cDBM, "VERSION", rb_sprintf("QDBM %s", dpversion)); + version = rb_sprintf("QDBM %s", dpversion); # else - rb_define_const(rb_cDBM, "VERSION", rb_str_new2("QDBM (unknown)")); + version = rb_str_new2("QDBM (unknown)"); # endif #else - rb_define_const(rb_cDBM, "VERSION", rb_str_new2("ndbm (unknown)")); + version = rb_str_new2("ndbm (unknown)"); #endif + rb_define_const(rb_cDBM, "VERSION", version); + } } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/