Replace *magic number* with a much nicer define.

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 13a61bb32251e692a83f5f863a9e0927d20cdaa3..5c9b9053235e7c22391798954abc0fe8c2ddd35f 100644 (file)
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -509,7 +509,7 @@ ZEND_FUNCTION(define)
        c.flags = case_sensitive; /* non persistent */
        c.name = zend_strndup((*var)->value.str.val, (*var)->value.str.len);
        c.name_len = (*var)->value.str.len+1;
-       c.module_number = 2147483647;
+       c.module_number = PHP_USER_CONSTANT;
        if (zend_register_constant(&c TSRMLS_CC) == SUCCESS) {
                RETURN_TRUE;
        } else {
@@ -1343,7 +1343,7 @@ ZEND_FUNCTION(get_defined_constants)
                while (zend_hash_get_current_data_ex(EG(zend_constants), (void **) &val, &pos) != FAILURE) {
                        zval *const_val;
 
-                       if (val->module_number == 2147483647) {
+                       if (val->module_number == PHP_USER_CONSTANT) {
                                module_number = i;
                        } else if (val->module_number > i || val->module_number < 0) {
                                /* should not happen */

diff --git a/Zend/zend_constants.h b/Zend/zend_constants.h
index 38f2e5a80eff36a969764d3b09f04d20e14de468..3b65ef97ddebdb1dc2addfcf14eb4c7c76b8fbc1 100644 (file)
--- a/Zend/zend_constants.h
+++ b/Zend/zend_constants.h
@@ -27,6 +27,8 @@
 #define CONST_CS                               (1<<0)                          /* Case Sensitive */
 #define CONST_PERSISTENT               (1<<1)                          /* Persistent */
 
+#define        PHP_USER_CONSTANT LONG_MAX      /* a constant defined in user space */
+
 typedef struct _zend_constant {
        zval value;
        int flags;