Sfoglia il codice sorgente

move #undef min/max to v8js_v8.h

Stefan Siegl 8 anni fa
parent
commit
e5f57b7661
3 ha cambiato i file con 6 aggiunte e 10 eliminazioni
  1. 0 5
      v8js_class.cc
  2. 0 5
      v8js_convert.cc
  3. 6 0
      v8js_v8.h

+ 0 - 5
v8js_class.cc

@@ -36,11 +36,6 @@ extern "C" {
 #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"
 
 /* {{{ Class Entries */

+ 0 - 5
v8js_convert.cc

@@ -34,11 +34,6 @@ extern "C" {
 #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) /* {{{ */
 {
 	zend_string *key;

+ 6 - 0
v8js_v8.h

@@ -36,6 +36,12 @@
 #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. */
 static inline const char * ToCString(const v8::String::Utf8Value &value) /* {{{ */
 {