mirror of
https://github.com/phpv8/v8js.git
synced 2025-01-05 11:41:52 +00:00
move #undef min/max to v8js_v8.h
This commit is contained in:
parent
b6d47ac7a8
commit
e5f57b7661
@ -36,11 +36,6 @@ extern "C" {
|
|||||||
#include "zend_exceptions.h"
|
#include "zend_exceptions.h"
|
||||||
}
|
}
|
||||||
|
|
||||||
/* On Windows there are max and min macros, which would clobber the
|
|
||||||
* method names of std::numeric_limits< > otherwise. */
|
|
||||||
#undef max
|
|
||||||
#undef min
|
|
||||||
|
|
||||||
#define PHP_V8JS_SCRIPT_RES_NAME "V8Js script"
|
#define PHP_V8JS_SCRIPT_RES_NAME "V8Js script"
|
||||||
|
|
||||||
/* {{{ Class Entries */
|
/* {{{ Class Entries */
|
||||||
|
@ -34,11 +34,6 @@ extern "C" {
|
|||||||
#include "zend_exceptions.h"
|
#include "zend_exceptions.h"
|
||||||
}
|
}
|
||||||
|
|
||||||
/* On Windows there are max and min macros, which would clobber the
|
|
||||||
* method names of std::numeric_limits< > otherwise. */
|
|
||||||
#undef max
|
|
||||||
#undef min
|
|
||||||
|
|
||||||
static int v8js_is_assoc_array(HashTable *myht TSRMLS_DC) /* {{{ */
|
static int v8js_is_assoc_array(HashTable *myht TSRMLS_DC) /* {{{ */
|
||||||
{
|
{
|
||||||
zend_string *key;
|
zend_string *key;
|
||||||
|
@ -36,6 +36,12 @@
|
|||||||
#define V8JS_GLOBAL(isolate) ((isolate)->GetCurrentContext()->Global())
|
#define V8JS_GLOBAL(isolate) ((isolate)->GetCurrentContext()->Global())
|
||||||
|
|
||||||
|
|
||||||
|
/* On Windows there are max and min macros, which would clobber the
|
||||||
|
* method names of std::numeric_limits< > otherwise. */
|
||||||
|
#undef max
|
||||||
|
#undef min
|
||||||
|
|
||||||
|
|
||||||
/* Extracts a C string from a V8 Utf8Value. */
|
/* Extracts a C string from a V8 Utf8Value. */
|
||||||
static inline const char * ToCString(const v8::String::Utf8Value &value) /* {{{ */
|
static inline const char * ToCString(const v8::String::Utf8Value &value) /* {{{ */
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user