Merge branch '1.6' of github.com:larskanis/fxruby into 1.6
Lars Kanis
4 years ago
| 24 | 24 |
***********************************************************************/
|
| 25 | 25 |
|
| 26 | 26 |
#include "FXRbCommon.h"
|
| 27 | |
|
| 28 | |
#if defined(RUBY_1_8)
|
| 29 | |
extern "C" {
|
| 30 | |
#include "rubysig.h" /* For CHECK_INTS */
|
| 31 | |
}
|
| 32 | |
#endif
|
| 33 | 27 |
|
| 34 | 28 |
#ifdef HAVE_SYS_TIME_H
|
| 35 | 29 |
#include <sys/time.h> /* For struct timeval */
|
|
| 148 | 142 |
wait.tv_sec=0;
|
| 149 | 143 |
wait.tv_usec=100*sleepTime;
|
| 150 | 144 |
|
| 151 | |
// Confirm that this thread can be interrupted, then go to sleep
|
| 152 | |
#if defined(RUBY_1_8)
|
| 153 | |
CHECK_INTS;
|
| 154 | |
if(!rb_thread_critical)
|
| 155 | |
rb_thread_wait_for(wait);
|
| 156 | |
#else
|
| 157 | |
// if(!rb_thread_critical) rb_thread_wait_for(wait);
|
| 158 | 145 |
rb_thread_wait_for(wait);
|
| 159 | |
#endif /* RUBY_1_8 */
|
| 160 | 146 |
|
| 161 | 147 |
// Re-register this chore for next time
|
| 162 | 148 |
addChore(this,ID_CHORE_THREADS);
|
| 42 | 42 |
#include <signal.h> // for definitions of SIGINT, etc.
|
| 43 | 43 |
#endif
|
| 44 | 44 |
|
| 45 | |
#if defined(RUBY_1_8)
|
| 46 | |
|
| 47 | |
extern "C" {
|
| 48 | |
#include "st.h"
|
| 49 | |
#include "rubyio.h" // for GetOpenFile(), etc.
|
| 50 | |
}
|
| 51 | |
|
| 52 | |
#else
|
| 53 | |
|
| 54 | 45 |
#include "ruby/io.h"
|
| 55 | 46 |
#include "ruby/st.h"
|
| 56 | |
|
| 57 | |
#endif /* RUBY_1_8 */
|
| 58 | 47 |
|
| 59 | 48 |
|
| 60 | 49 |
// Opaque type declaration from SWIG runtime
|
|
| 1661 | 1650 |
VALUE vwrite = rb_intern("@write");
|
| 1662 | 1651 |
if(rb_ivar_defined(obj, vwrite)) obj = rb_ivar_get(obj, vwrite);
|
| 1663 | 1652 |
fd = FIX2INT(rb_funcall(obj, rb_intern("fileno"), 0));
|
| 1664 | |
#elif defined(RUBY_1_8)
|
| 1665 | |
OpenFile *fptr;
|
| 1666 | |
GetOpenFile(obj, fptr);
|
| 1667 | |
FILE *fpw=GetWriteFile(fptr);
|
| 1668 | |
fd = fileno(fpw);
|
| 1669 | 1653 |
#else
|
| 1670 | 1654 |
rb_io_t *fptr;
|
| 1671 | 1655 |
GetOpenFile(obj, fptr);
|
| 308 | 308 |
# Platform-specific modifications
|
| 309 | 309 |
do_rake_compiler_setup
|
| 310 | 310 |
|
| 311 | |
$CFLAGS += " -DRUBY_1_8" if RUBY_VERSION =~ /1\.8\./
|
| 312 | |
$CFLAGS += " -DRUBY_1_9" if RUBY_VERSION =~ /1\.9\./
|
| 313 | |
$CFLAGS += " -DRUBY_2_0" if RUBY_VERSION =~ /2\.0\./
|
| 314 | |
|
| 315 | 311 |
if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc/
|
| 316 | 312 |
$CXXFLAGS += " -Wno-unused-function"
|
| 317 | 313 |
$CXXFLAGS += " -Wno-maybe-uninitialized"
|
| 23 | 23 |
* $Id: FXRbCommon.h 2303 2005-12-09 03:17:28Z lyle $
|
| 24 | 24 |
***********************************************************************/
|
| 25 | 25 |
|
| 26 | |
extern "C" {
|
| 27 | 26 |
#include "ruby.h"
|
| 28 | 27 |
|
| 29 | 28 |
#include "extconf.h"
|
|
| 31 | 30 |
#ifdef HAVE_RUBY_ENCODING_H
|
| 32 | 31 |
#include "ruby/encoding.h"
|
| 33 | 32 |
#endif
|
| 34 | |
}
|
| 35 | 33 |
|
| 36 | 34 |
/**
|
| 37 | 35 |
* The Ruby header files for Win32 redefine the symbol "select", which
|
| 14 | 14 |
#ifndef __gvl_wrappers_h
|
| 15 | 15 |
#define __gvl_wrappers_h
|
| 16 | 16 |
|
| 17 | |
extern "C" {
|
| 18 | |
#if defined(HAVE_RB_THREAD_CALL_WITH_GVL)
|
| 19 | |
extern void *rb_thread_call_with_gvl(void *(*func)(void *), void *data1);
|
| 20 | |
#endif
|
| 21 | |
|
| 22 | |
#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
|
| 23 | |
extern "C" void *rb_thread_call_without_gvl(void *(*func)(void *), void *data1,
|
| 24 | |
rb_unblock_function_t *ubf, void *data2);
|
| 25 | |
#endif
|
| 26 | |
}
|
|
17 |
#if defined(HAVE_RB_THREAD_CALL_WITH_GVL)
|
|
18 |
extern "C" void *rb_thread_call_with_gvl(void *(*func)(void *), void *data1);
|
|
19 |
#endif
|
|
20 |
|
|
21 |
#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
|
|
22 |
extern "C" void *rb_thread_call_without_gvl(void *(*func)(void *), void *data1,
|
|
23 |
rb_unblock_function_t *ubf, void *data2);
|
|
24 |
#endif
|
| 27 | 25 |
|
| 28 | 26 |
void fxrb_wakeup_fox(void *);
|
| 29 | 27 |
|