aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-19 15:57:31 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-19 15:57:31 +0000
commitfdc41af7742456d31f007715d419a45aad4b8849 (patch)
tree8fd5f64b4cfe2c25c2efeda2060d23c070555919
parent595ce95d3c63a40fb3234cba4c59eb6c8f60faf8 (diff)
downloadruby-fdc41af7742456d31f007715d419a45aad4b8849.tar.gz
* internal.h (ruby_init_setproctitle): Declare here.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--internal.h5
-rw-r--r--ruby.c5
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 7229834519..c4151406f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Nov 20 00:54:57 2014 Tanaka Akira <akr@fsij.org>
+
+ * internal.h (ruby_init_setproctitle): Declare here.
+
Thu Nov 20 00:26:37 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (parser_here_document): append byte sequence directly to
diff --git a/internal.h b/internal.h
index 128c05379d..4e5c01a638 100644
--- a/internal.h
+++ b/internal.h
@@ -468,6 +468,11 @@ struct RHash {
#define RHASH_SIZE(h) (RHASH(h)->ntbl ? (st_index_t)RHASH(h)->ntbl->num_entries : 0)
#endif
+/* missing/setproctitle.c */
+#ifndef HAVE_SETPROCTITLE
+extern void ruby_init_setproctitle(int argc, char *argv[]);
+#endif
+
/* class.c */
void rb_class_subclass_add(VALUE super, VALUE klass);
void rb_class_remove_from_super_subclasses(VALUE);
diff --git a/ruby.c b/ruby.c
index fdd843e1dc..4a19276f50 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1930,10 +1930,7 @@ ruby_process_options(int argc, char **argv)
iseq = process_options(argc, argv, cmdline_options_init(&opt));
#ifndef HAVE_SETPROCTITLE
- {
- extern void ruby_init_setproctitle(int argc, char *argv[]);
- ruby_init_setproctitle(argc, argv);
- }
+ ruby_init_setproctitle(argc, argv);
#endif
return (void*)(struct RData*)iseq;