* include/ruby/version.h (RUBY_API_VERSION_*): renamed and moved

  from version.h.  [ruby-dev:42103]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29082 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

5 files changed, 26 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index f57057daba..04eb818ce7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 24 06:08:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/version.h (RUBY_API_VERSION_*): renamed and moved
+	  from version.h.  [ruby-dev:42103]
+
 Tue Aug 24 05:58:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ChangeLog: flushed.  [ruby-dev:42050]
diff --git a/include/ruby/version.h b/include/ruby/version.h
index 101b5d9c63..458efff320 100644
--- a/include/ruby/version.h
+++ b/include/ruby/version.h
@@ -29,6 +29,12 @@
 #define RUBY_BIRTH_MONTH 2
 #define RUBY_BIRTH_DAY 24
 
+/* API version */
+#define RUBY_API_VERSION_MAJOR 1
+#define RUBY_API_VERSION_MINOR 9
+#define RUBY_API_VERSION_TEENY 1
+#define RUBY_API_VERSION_CODE (RUBY_API_VERSION_MAJOR*10000+RUBY_API_VERSION_MINOR*100+RUBY_API_VERSION_TEENY)
+
 #ifdef RUBY_EXTERN
 #if defined(__cplusplus)
 extern "C" {
@@ -48,6 +54,7 @@ extern "C" {
  * necessary or not, and if the answer was yes, think twice a week
  * later again.
  */
+RUBY_EXTERN const int ruby_api_version[3];
 RUBY_EXTERN const char ruby_version[];
 RUBY_EXTERN const char ruby_release_date[];
 RUBY_EXTERN const char ruby_platform[];
diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
index 07d6982701..da636c971f 100755
--- a/tool/mkconfig.rb
+++ b/tool/mkconfig.rb
@@ -144,9 +144,16 @@ print "  CONFIG[\"DESTDIR\"] = DESTDIR\n"
 
 versions = {}
 IO.foreach(File.join(srcdir, "version.h")) do |l|
-  m = /^\s*#\s*define\s+RUBY_(VERSION_(MAJOR|MINOR|TEENY)|PATCHLEVEL)\s+(-?\d+)/.match(l)
+  m = /^\s*#\s*define\s+RUBY_(PATCHLEVEL)\s+(-?\d+)/.match(l)
   if m
-    versions[m[2]||m[1]] = m[3]
+    versions[m[1]] = m[2]
+    break
+  end
+end
+IO.foreach(File.join(srcdir, "include/ruby/version.h")) do |l|
+  m = /^\s*#\s*define\s+RUBY_API_VERSION_(MAJOR|MINOR|TEENY)\s+(-?\d+)/.match(l)
+  if m
+    versions[m[1]] = m[2]
     break if versions.size == 4
   end
 end
diff --git a/version.c b/version.c
index a0008efad6..c007470b11 100644
--- a/version.c
+++ b/version.c
@@ -50,6 +50,11 @@
 #define RUBY_VENDOR_THIN_ARCHLIB    RUBY_VENDOR_LIB2 "/"RUBY_THINARCH
 #endif
 
+const int ruby_api_version[] = {
+    RUBY_API_VERSION_MAJOR,
+    RUBY_API_VERSION_MINOR,
+    RUBY_API_VERSION_TEENY,
+};
 const char ruby_version[] = RUBY_VERSION;
 const char ruby_release_date[] = RUBY_RELEASE_DATE;
 const char ruby_platform[] = RUBY_PLATFORM;
diff --git a/version.h b/version.h
index 96d4c12a18..6ade1340b0 100644
--- a/version.h
+++ b/version.h
@@ -3,9 +3,6 @@
 #define RUBY_PATCHLEVEL -1
 #define RUBY_BRANCH_NAME "trunk"
 
-#define RUBY_VERSION_MAJOR 1
-#define RUBY_VERSION_MINOR 9
-#define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 8
 #define RUBY_RELEASE_DAY 24