aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-01-17 08:13:50 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-01-17 08:13:50 +0000
commitb3e2baa3b5469141b6618386e679cf168332cc56 (patch)
tree884c1ad1d6656b95cc830a31f9299e14ac233e37
parenteec5d2014ff4287ab2d8de7e495f8c8291572394 (diff)
downloadruby-b3e2baa3b5469141b6618386e679cf168332cc56.tar.gz
* missing/setproctitle.c (ruby_init_setproctitle): changed prefix.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--missing/setproctitle.c1
-rw-r--r--ruby.c4
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2a14677b7a..05e8519826 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan 17 17:13:46 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * missing/setproctitle.c (ruby_init_setproctitle): changed prefix.
+
Tue Jan 17 12:32:46 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* gc.c (aligned_malloc, aligned_free): covered missing defined
diff --git a/missing/setproctitle.c b/missing/setproctitle.c
index f4078bd993..169ba8bcd2 100644
--- a/missing/setproctitle.c
+++ b/missing/setproctitle.c
@@ -34,6 +34,7 @@
#include "ruby.h"
#include "ruby/util.h"
+#define compat_init_setproctitle ruby_init_setproctitle
#ifndef HAVE_SETPROCTITLE
diff --git a/ruby.c b/ruby.c
index 7e06a128dc..1ad68caeb1 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1809,8 +1809,8 @@ ruby_process_options(int argc, char **argv)
#ifndef HAVE_SETPROCTITLE
{
- extern void compat_init_setproctitle(int argc, char *argv[]);
- compat_init_setproctitle(argc, argv);
+ extern void ruby_init_setproctitle(int argc, char *argv[]);
+ ruby_init_setproctitle(argc, argv);
}
#endif