Skip to content

Commit f0fdb82

Browse files
committed
bigger memory_limit should work now on 64 bit windows
1 parent 4a5fee1 commit f0fdb82

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Zend/zend_operators.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,14 @@ ZEND_API int zend_atoi(const char *str, zend_str_size_int str_len) /* {{{ */
107107
}
108108
/* }}} */
109109

110-
ZEND_API long zend_atol(const char *str, zend_str_size_int str_len) /* {{{ */
110+
ZEND_API zend_int_t zend_atol(const char *str, zend_str_size_int str_len) /* {{{ */
111111
{
112-
long retval;
112+
zend_int_t retval;
113113

114114
if (!str_len) {
115115
str_len = strlen(str);
116116
}
117-
retval = strtol(str, NULL, 0);
117+
retval = ZEND_STRTOL(str, NULL, 0);
118118
if (str_len>0) {
119119
switch (str[str_len-1]) {
120120
case 'g':

Zend/zend_operators.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ ZEND_API void zend_compare_arrays(zval *result, zval *a1, zval *a2 TSRMLS_DC);
377377
ZEND_API void zend_compare_objects(zval *result, zval *o1, zval *o2 TSRMLS_DC);
378378

379379
ZEND_API int zend_atoi(const char *str, zend_str_size_int str_len);
380-
ZEND_API long zend_atol(const char *str, zend_str_size_int str_len);
380+
ZEND_API zend_int_t zend_atol(const char *str, zend_str_size_int str_len);
381381

382382
ZEND_API void zend_locale_sprintf_double(zval *op ZEND_FILE_LINE_DC);
383383
END_EXTERN_C()

main/php_globals.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ struct _php_core_globals {
6666
char *unserialize_callback_func;
6767
long serialize_precision;
6868

69-
long memory_limit;
69+
zend_int_t memory_limit;
7070
long max_input_time;
7171

7272
zend_bool track_errors;

0 commit comments

Comments
 (0)