зеркало из https://github.com/github/ruby.git
* internal.h: move rb_thread_io_blocking_region() declaration
from intern.h to internal.h. It's still experimental API and need more discussion. [ruby-dev:43698] * include/ruby/intern.h: ditto. * ext/socket/rubysocket.h: include internal.h. * ext/socket/depend: add internal.h dependency. * ext/socket/extconf.rb: add $INCFLAGS to topdir. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32187 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
b9d9ea62b4
Коммит
908baefe7d
11
ChangeLog
11
ChangeLog
|
@ -1,3 +1,14 @@
|
|||
Tue Jun 21 21:27:34 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
|
||||
|
||||
* internal.h: move rb_thread_io_blocking_region() declaration
|
||||
from intern.h to internal.h. It's still experimental API and
|
||||
need more discussion. [ruby-dev:43698]
|
||||
* include/ruby/intern.h: ditto.
|
||||
|
||||
* ext/socket/rubysocket.h: include internal.h.
|
||||
* ext/socket/depend: add internal.h dependency.
|
||||
* ext/socket/extconf.rb: add $INCFLAGS to topdir.
|
||||
|
||||
Tue Jun 21 20:38:47 2011 Tadayoshi Funaba <tadf@dotrb.org>
|
||||
|
||||
* ext/date/date_core.c (datetime_s_*): canonicalize 24 o'clock.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
SOCK_HEADERS = $(srcdir)/rubysocket.h $(hdrdir)/ruby/ruby.h $(arch_hdrdir)/ruby/config.h \
|
||||
$(hdrdir)/ruby/defines.h $(hdrdir)/ruby/io.h \
|
||||
$(srcdir)/addrinfo.h $(srcdir)/sockport.h constdefs.h
|
||||
$(srcdir)/addrinfo.h $(srcdir)/sockport.h constdefs.h $(topdir)/internal.h
|
||||
|
||||
init.o: init.c $(SOCK_HEADERS)
|
||||
constants.o: constants.c constdefs.c $(SOCK_HEADERS)
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
require 'mkmf'
|
||||
|
||||
$INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
|
||||
|
||||
case RUBY_PLATFORM
|
||||
when /(ms|bcc)win(32|64)|mingw/
|
||||
test_func = "WSACleanup"
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
#include "ruby/ruby.h"
|
||||
#include "ruby/io.h"
|
||||
#include "ruby/util.h"
|
||||
#include "internal.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
|
|
@ -806,7 +806,6 @@ void rb_thread_check_ints(void);
|
|||
int rb_thread_interrupted(VALUE thval);
|
||||
VALUE rb_thread_blocking_region(rb_blocking_function_t *func, void *data1,
|
||||
rb_unblock_function_t *ubf, void *data2);
|
||||
VALUE rb_thread_io_blocking_region(rb_blocking_function_t *func, void *data1, int fd);
|
||||
#define RUBY_UBF_IO ((rb_unblock_function_t *)-1)
|
||||
#define RUBY_UBF_PROCESS ((rb_unblock_function_t *)-1)
|
||||
VALUE rb_mutex_new(void);
|
||||
|
|
|
@ -187,6 +187,14 @@ void Init_eval_method(void);
|
|||
/* miniprelude.c, prelude.c */
|
||||
void Init_prelude(void);
|
||||
|
||||
#if defined __GNUC__ && __GNUC__ >= 4
|
||||
#pragma GCC visibility push(default)
|
||||
#endif
|
||||
VALUE rb_thread_io_blocking_region(rb_blocking_function_t *func, void *data1, int fd);
|
||||
#if defined __GNUC__ && __GNUC__ >= 4
|
||||
#pragma GCC visibility pop
|
||||
#endif
|
||||
|
||||
#if defined(__cplusplus)
|
||||
#if 0
|
||||
{ /* satisfy cc-mode */
|
||||
|
|
Загрузка…
Ссылка в новой задаче