com php-src: some more linux fixes: Zend/zend_int.h ext/s tandard/php_array.h
| From: | Anatol Belski | Date: | Wed, 16 Oct 2013 10:14:23 +0000 |
| Subject: | com php-src: some more linux fixes: Zend/zend_int.h ext/s tandard/php_array.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-73450@lists.php.net to get a copy of this message | ||
Commit: c47840d92b784c7f26d77f7bb4c5df8066260396
Author: Anatol Belski <ab@php.net> Mon, 26 Aug 2013 05:54:33 -0700
Parents: 8949c825c7afe2ba8054fb488a47efec8693e769
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c47840d92b784c7f26d77f7bb4c5df8066260396
Log:
some more linux fixes
Changed paths:
M Zend/zend_int.h
M ext/standard/php_array.h
Diff:
diff --git a/Zend/zend_int.h b/Zend/zend_int.h
index c2df1e7..b6ebd20 100644
--- a/Zend/zend_int.h
+++ b/Zend/zend_int.h
@@ -3,6 +3,11 @@
#ifndef ZEND_INT_H
#define ZEND_INT_H
+#ifndef ZEND_WIN32
+/* this probably needs more on non windows, like for C++ and C99*/
+# include <stdint.h>
+#endif
+
/* Integer types or the old good long. This part will have to be
reworked, obviously if we wanna some platform dependent stuff. */
#ifdef ZEND_ENABLE_INT64
diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h
index 1cf2779..85002eb 100644
--- a/ext/standard/php_array.h
+++ b/ext/standard/php_array.h
@@ -103,7 +103,7 @@ PHP_FUNCTION(array_key_exists);
PHP_FUNCTION(array_chunk);
PHP_FUNCTION(array_combine);
-PHPAPI HashTable* php_splice(HashTable *, int, int, zval ***, int, HashTable **);
+PHPAPI HashTable* php_splice(HashTable *, php_int_t, php_int_t, zval ***, php_int_t, HashTable **);
PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive TSRMLS_DC);
PHPAPI int php_array_replace_recursive(HashTable *dest, HashTable *src TSRMLS_DC);
PHPAPI int php_multisort_compare(const void *a, const void *b TSRMLS_DC);