mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
fix r36079
* include/ruby/ruby.h: public symbols must have default visibility. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36081 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
22e7c535a6
commit
073297789a
5 changed files with 15 additions and 15 deletions
2
eval.c
2
eval.c
|
@ -283,7 +283,7 @@ ruby_eval_main_internal(VALUE iseqval, VALUE* result)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
POP_TAG();
|
POP_TAG();
|
||||||
*result = state ? th->errinfo : retval;
|
*result = state ? th->errinfo : retval;
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1464,10 +1464,6 @@ unsigned long ruby_strtoul(const char *str, char **endptr, int base);
|
||||||
PRINTF_ARGS(int ruby_snprintf(char *str, size_t n, char const *fmt, ...), 3, 4);
|
PRINTF_ARGS(int ruby_snprintf(char *str, size_t n, char const *fmt, ...), 3, 4);
|
||||||
int ruby_vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
|
int ruby_vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
|
||||||
|
|
||||||
#if defined __GNUC__ && __GNUC__ >= 4
|
|
||||||
#pragma GCC visibility pop
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef RUBY_DONT_SUBST
|
#ifndef RUBY_DONT_SUBST
|
||||||
#include "ruby/subst.h"
|
#include "ruby/subst.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -1488,7 +1484,7 @@ int ruby_vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
|
||||||
*/
|
*/
|
||||||
typedef void *ruby_opaque_t;
|
typedef void *ruby_opaque_t;
|
||||||
|
|
||||||
/*! @deprecated You no longer need to use this macro. */
|
/*! @deprecated You no longer need to use this macro. */
|
||||||
#if (defined(__APPLE__) || defined(__NeXT__)) && defined(__MACH__)
|
#if (defined(__APPLE__) || defined(__NeXT__)) && defined(__MACH__)
|
||||||
#define RUBY_GLOBAL_SETUP /* use linker option to link startup code with ObjC support */
|
#define RUBY_GLOBAL_SETUP /* use linker option to link startup code with ObjC support */
|
||||||
#else
|
#else
|
||||||
|
@ -1555,6 +1551,10 @@ void ruby_sig_finalize(void);
|
||||||
|
|
||||||
/*! @} */
|
/*! @} */
|
||||||
|
|
||||||
|
#if defined __GNUC__ && __GNUC__ >= 4
|
||||||
|
#pragma GCC visibility pop
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(__cplusplus)
|
#if defined(__cplusplus)
|
||||||
#if 0
|
#if 0
|
||||||
{ /* satisfy cc-mode */
|
{ /* satisfy cc-mode */
|
||||||
|
|
|
@ -265,8 +265,8 @@ pruby_str_to_var(volatile VALUE str)
|
||||||
|
|
||||||
static struct PP_Var
|
static struct PP_Var
|
||||||
pruby_obj_to_var(volatile VALUE obj)
|
pruby_obj_to_var(volatile VALUE obj)
|
||||||
{
|
{
|
||||||
static const char* const error =
|
static const char* const error =
|
||||||
"throw 'Failed to convert the result to a JavaScript object';";
|
"throw 'Failed to convert the result to a JavaScript object';";
|
||||||
int state;
|
int state;
|
||||||
obj = rb_protect(&rb_obj_as_string, obj, &state);
|
obj = rb_protect(&rb_obj_as_string, obj, &state);
|
||||||
|
@ -318,7 +318,7 @@ pruby_post_cstr(void* data)
|
||||||
/* PPAPI main thread */
|
/* PPAPI main thread */
|
||||||
struct PepperInstance* const instance = (struct PepperInstance*)data;
|
struct PepperInstance* const instance = (struct PepperInstance*)data;
|
||||||
const char* const msg = (const char*)instance->async_call_args;
|
const char* const msg = (const char*)instance->async_call_args;
|
||||||
messaging_interface->PostMessage(instance->instance,
|
messaging_interface->PostMessage(instance->instance,
|
||||||
pruby_cstr_to_var(msg));
|
pruby_cstr_to_var(msg));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -445,7 +445,7 @@ pruby_eval(void* data)
|
||||||
pthread_mutex_unlock(&instance->mutex);
|
pthread_mutex_unlock(&instance->mutex);
|
||||||
|
|
||||||
if (!state) {
|
if (!state) {
|
||||||
instance->async_call_args =
|
instance->async_call_args =
|
||||||
rb_str_concat(rb_usascii_str_new_cstr("return:"),
|
rb_str_concat(rb_usascii_str_new_cstr("return:"),
|
||||||
rb_obj_as_string(result));
|
rb_obj_as_string(result));
|
||||||
core_interface->CallOnMainThread(
|
core_interface->CallOnMainThread(
|
||||||
|
@ -805,7 +805,7 @@ load_file_read_contents_callback(void *data, int result)
|
||||||
{
|
{
|
||||||
struct PepperInstance* const instance = (struct PepperInstance*)data;
|
struct PepperInstance* const instance = (struct PepperInstance*)data;
|
||||||
if (result > 0) {
|
if (result > 0) {
|
||||||
rb_str_buf_cat(instance->async_call_result.as_value,
|
rb_str_buf_cat(instance->async_call_result.as_value,
|
||||||
instance->buf, result);
|
instance->buf, result);
|
||||||
loader_interface->ReadResponseBody(
|
loader_interface->ReadResponseBody(
|
||||||
instance->url_loader, instance->buf, 1000, PP_MakeCompletionCallback(load_file_read_contents_callback, instance));
|
instance->url_loader, instance->buf, 1000, PP_MakeCompletionCallback(load_file_read_contents_callback, instance));
|
||||||
|
@ -868,7 +868,7 @@ rb_load_file(const char *path)
|
||||||
}
|
}
|
||||||
else if (RB_TYPE_P(instance->async_call_result.as_value, T_STRING)) {
|
else if (RB_TYPE_P(instance->async_call_result.as_value, T_STRING)) {
|
||||||
VALUE str = instance->async_call_result.as_value;
|
VALUE str = instance->async_call_result.as_value;
|
||||||
extern void* rb_compile_cstr(const char *f, const char *s, int len, int line);
|
extern void* rb_compile_cstr(const char *f, const char *s, int len, int line);
|
||||||
return rb_compile_cstr(path, RSTRING_PTR(str), RSTRING_LEN(str), 0);
|
return rb_compile_cstr(path, RSTRING_PTR(str), RSTRING_LEN(str), 0);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
4
ruby.c
4
ruby.c
|
@ -1753,7 +1753,7 @@ parse_and_compile_main(VALUE fname, const struct ruby_compile_main_arg* arg, VAL
|
||||||
* @li loads the file specified by path.
|
* @li loads the file specified by path.
|
||||||
* @li parses the source and compiles it
|
* @li parses the source and compiles it
|
||||||
*
|
*
|
||||||
* @param fname <code>$0</code> is set to this value.
|
* @param fname <code>$0</code> is set to this value.
|
||||||
* If nil,
|
* If nil,
|
||||||
* uses the given path instead.
|
* uses the given path instead.
|
||||||
* @param path path to the source
|
* @param path path to the source
|
||||||
|
@ -1776,7 +1776,7 @@ ruby_compile_main_from_file(VALUE fname, const char* path, VALUE* error)
|
||||||
*
|
*
|
||||||
* This function parses the given source and compiles it
|
* This function parses the given source and compiles it
|
||||||
*
|
*
|
||||||
* @param fname <code>$0</code> is set to this value.
|
* @param fname <code>$0</code> is set to this value.
|
||||||
* @param source Ruby source string
|
* @param source Ruby source string
|
||||||
* @param error where to store the exception if an error occured.
|
* @param error where to store the exception if an error occured.
|
||||||
* @return The compiled source code. Or NULL if an error occured.
|
* @return The compiled source code. Or NULL if an error occured.
|
||||||
|
|
|
@ -459,7 +459,7 @@ typedef struct rb_thread_struct {
|
||||||
struct rb_vm_protect_tag *protect_tag;
|
struct rb_vm_protect_tag *protect_tag;
|
||||||
|
|
||||||
/*! Thread-local state of evaluation context.
|
/*! Thread-local state of evaluation context.
|
||||||
*
|
*
|
||||||
* If negative, this thread is evaluating the main program.
|
* If negative, this thread is evaluating the main program.
|
||||||
* If positive, this thread is evaluating a program under Kernel::eval
|
* If positive, this thread is evaluating a program under Kernel::eval
|
||||||
* family.
|
* family.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue