aboutsummaryrefslogtreecommitdiffstats
path: root/version.h
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-09 00:19:16 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-09 00:19:16 +0000
commitbc8a7f9ab715595df6669db00efe7ad8e36b970e (patch)
treef238f6683cc2881772e412a8ee236f3d0199c900 /version.h
parentfca0cf6e6b8ab8882f3403e5909c8eb91c5c351e (diff)
downloadruby-bc8a7f9ab715595df6669db00efe7ad8e36b970e.tar.gz
revert r53459, r53427, r53314
Revert "* tool/make-snapshot: fix for the changes of version.h in r53314." Revert "* version.h (RUBY_BUILD_VERSION_STR_3): Workaround for old version of" Revert "program version from API version" git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53472 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r--version.h16
1 files changed, 3 insertions, 13 deletions
diff --git a/version.h b/version.h
index a32012d92a..d1c253b3b1 100644
--- a/version.h
+++ b/version.h
@@ -1,12 +1,4 @@
-#define RUBY_PROGRAM_VERSION_MAJOR RUBY_API_VERSION_MAJOR
-#define RUBY_PROGRAM_VERSION_MINOR RUBY_API_VERSION_MINOR
-#define RUBY_PROGRAM_VERSION_TEENY 0
-
-#define RUBY_BUILD_VERSION_STR_2(v) STRINGIZE(v##_MAJOR)"."STRINGIZE(v##_MINOR)
-#define RUBY_BUILD_VERSION_STR_3(v) STRINGIZE(v##_MAJOR)"."STRINGIZE(v##_MINOR)"."STRINGIZE(v##_TEENY)
-
-#define RUBY_PROGRAM_VERSION RUBY_BUILD_VERSION_STR_3(RUBY_PROGRAM_VERSION)
-#define RUBY_VERSION RUBY_PROGRAM_VERSION
+#define RUBY_VERSION "2.4.0"
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL -1
@@ -33,13 +25,11 @@
#define RUBY_RELEASE_DAY_STR STRINGIZE(RUBY_RELEASE_DAY)
#endif
-#define RUBY_LIB_VERSION_2 RUBY_BUILD_VERSION_STR_2(RUBY_API_VERSION)
-#define RUBY_LIB_VERSION_3 RUBY_BUILD_VERSION_STR_3(RUBY_API_VERSION)
#if !defined RUBY_LIB_VERSION && defined RUBY_LIB_VERSION_STYLE
# if RUBY_LIB_VERSION_STYLE == 3
-# define RUBY_LIB_VERSION RUBY_LIB_VERSION_3
+# define RUBY_LIB_VERSION STRINGIZE(RUBY_API_VERSION_MAJOR)"."STRINGIZE(RUBY_API_VERSION_MINOR)"."STRINGIZE(RUBY_API_VERSION_TEENY)
# elif RUBY_LIB_VERSION_STYLE == 2
-# define RUBY_LIB_VERSION RUBY_LIB_VERSION_2
+# define RUBY_LIB_VERSION STRINGIZE(RUBY_API_VERSION_MAJOR)"."STRINGIZE(RUBY_API_VERSION_MINOR)
# endif
#endif