summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 3d852be062..03ef52bdc3 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.
+
Mon Jan 16 16:41:53 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/optparse.rb (Regexp): fix incorrect options when casting to
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 b53784feb1..f2c92fc426 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1807,8 +1807,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