- MFB: Making compatible with 64bit platform

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 664ee6ccdc9d4832a814c0405a37c409be7c0245..089e10b417fefa03e8be52003c720d29e967cd30 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2250,7 +2250,7 @@ PHP_FUNCTION(array_slice)
        /* ..and the length */
        if (length < 0) {
                length = num_in - offset + length;
-       } else if (((unsigned) offset + (unsigned) length) > (unsigned) num_in) {
+       } else if (((unsigned long) offset + (unsigned long) length) > (unsigned) num_in) {
                length = num_in - offset;
        }
 

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index cec0b1f636c4289a48d193ad94cdde07574e1559..1ea91afdc76ff16b9b9cd9a5ecb9eb79c17e2e58 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -3859,9 +3859,17 @@ static void php_putenv_destructor(putenv_entry *pe)
                SetEnvironmentVariable(pe->key, "bugbug");
 #endif
                putenv(pe->previous_value);
+<<<<<<< basic_functions.c
+#if defined(PHP_WIN32) || (defined (__FreeBSD__) && (__FreeBSD__ < 7))
+=======
 # if defined(PHP_WIN32)
+>>>>>>> 1.725.2.31.2.71
                efree(pe->previous_value);
+<<<<<<< basic_functions.c
+#endif
+=======
 # endif
+>>>>>>> 1.725.2.31.2.71
        } else {
 # if HAVE_UNSETENV
                unsetenv(pe->key);
@@ -4461,8 +4469,13 @@ PHP_FUNCTION(putenv)
                pe.previous_value = NULL;
                for (env = environ; env != NULL && *env != NULL; env++) {
                        if (!strncmp(*env, pe.key, pe.key_len) && (*env)[pe.key_len] == '=') {  /* found it */
+<<<<<<< basic_functions.c
+#if defined(PHP_WIN32) || (defined (__FreeBSD__) && (__FreeBSD__ < 7))
+                               /* must copy previous value because putenv can free the string without notice */
+=======
 #if defined(PHP_WIN32)
                                /* must copy previous value because MSVCRT's putenv can free the string without notice */
+>>>>>>> 1.725.2.31.2.71
                                pe.previous_value = estrdup(*env);
 #else
                                pe.previous_value = *env;