From 7637592bfd62f0fcbd6897e65abf1bf3fa78488c Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 12 Jan 2009 13:32:24 +0000
Subject: merges r21415 and r21417 from trunk into ruby_1_9_1. * version.h:
 make version string succinct:   "ruby 1.9.1p5000 (2009-01-10 trunk 21414)
 [i686-linux]".

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 version.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'version.h')

diff --git a/version.h b/version.h
index 921d6b5dd..03735aac0 100644
--- a/version.h
+++ b/version.h
@@ -23,14 +23,15 @@ RUBY_EXTERN const char ruby_copyright[];
 #define RUBY_BIRTH_MONTH 2
 #define RUBY_BIRTH_DAY 24
 
+#define RUBY_PATCHLEVEL_STR "p"STRINGIZE(RUBY_PATCHLEVEL)
+
 #ifndef RUBY_REVISION
-#include "revision.h"
+# include "revision.h"
 #endif
-#ifndef RUBY_REVISION
-#define RUBY_REVISION 0
+# ifndef RUBY_REVISION
+# define RUBY_REVISION 0
 #endif
 
-#define RUBY_PATCHLEVEL_STR " patchlevel-"STRINGIZE(RUBY_PATCHLEVEL)
 #if RUBY_REVISION
 # ifdef RUBY_BRANCH_NAME
 #  define RUBY_REVISION_STR " "RUBY_BRANCH_NAME" "STRINGIZE(RUBY_REVISION)
@@ -43,8 +44,8 @@ RUBY_EXTERN const char ruby_copyright[];
 
 # define RUBY_DESCRIPTION	    \
     "ruby "RUBY_VERSION		    \
+    RUBY_PATCHLEVEL_STR             \
     " ("RUBY_RELEASE_DATE	    \
-    RUBY_PATCHLEVEL_STR		    \
     RUBY_REVISION_STR") "	    \
     "["RUBY_PLATFORM"]"
 # define RUBY_COPYRIGHT 	    \
-- 
cgit