Changeset 331 for EcnlProtoTool/trunk/onigmo-6.1.3/src/regversion.c

Timestamp:

Jan 21, 2018, 12:10:09 AM (6 years ago)

Author:

coas-nagasima

Message:

prototoolに関連するプロジェクトをnewlibからmuslを使うよう変更・更新
ntshellをnewlibの下位の実装から、muslのsyscallの実装に変更・更新
以下のOSSをアップデート
・mruby-1.3.0
・musl-1.1.18
・onigmo-6.1.3
・tcc-0.9.27
以下のOSSを追加
・openssl-1.1.0e
・curl-7.57.0
・zlib-1.2.11
以下のmrbgemsを追加
・iij/mruby-digest
・iij/mruby-env
・iij/mruby-errno
・iij/mruby-iijson
・iij/mruby-ipaddr
・iij/mruby-mock
・iij/mruby-require
・iij/mruby-tls-openssl

Location:

EcnlProtoTool/trunk/onigmo-6.1.3

Files:

• . (moved) (moved from EcnlProtoTool/trunk/onigmo-5.15.0 )
• src/regversion.c (modified) (3 diffs)

EcnlProtoTool/trunk/onigmo-6.1.3/src/regversion.c

@@ -3 +3 @@
 **********************************************************************/
 /*-
- * Copyright (c) 2002-2009  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011-2014  K.Takata  <kentkt AT csc DOT jp>
+ * Copyright (c) 2002-2016  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2011-2017  K.Takata  <kentkt AT csc DOT jp>
  * All rights reserved.
  *
@@ -29 +29 @@
  */
 
-#include "config.h"
-#include "oniguruma.h"
-#include <stdio.h>
+#include "onigmo.h"
+
+#define TOSTR_(a)       #a
+#define ONIG_VERSION_TOSTR_(a,b,c)      \
+        TOSTR_(a) "." TOSTR_(b) "." TOSTR_(c)
+#define ONIG_VERSION_STRING     \
+        ONIG_VERSION_TOSTR_(ONIGMO_VERSION_MAJOR, ONIGMO_VERSION_MINOR, ONIGMO_VERSION_TEENY)
 
 extern const char*
 onig_version(void)
 {
-  static char s[12];
+  const char *s = ONIG_VERSION_STRING;
 
-  sprintf(s, "%d.%d.%d",
-          ONIGURUMA_VERSION_MAJOR,
-          ONIGURUMA_VERSION_MINOR,
-          ONIGURUMA_VERSION_TEENY);
   return s;
 }
@@ -48 +48 @@
 onig_copyright(void)
 {
-  static char s[80];
+  const char *s =
+    "Onigmo " ONIG_VERSION_STRING " : Copyright (C) 2002-2016 K.Kosako, "
+    "2011-2017 K.Takata";
 
-  sprintf(s, "Onigmo %d.%d.%d : Copyright (C) 2002-2009 K.Kosako, "
-             "2011-2014 K.Takata",
-          ONIGURUMA_VERSION_MAJOR,
-          ONIGURUMA_VERSION_MINOR,
-          ONIGURUMA_VERSION_TEENY);
   return s;
 }