Skip to content

Commit c47840d

Browse files
committed
some more linux fixes
1 parent 8949c82 commit c47840d

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

Zend/zend_int.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
#ifndef ZEND_INT_H
44
#define ZEND_INT_H
55

6+
#ifndef ZEND_WIN32
7+
/* this probably needs more on non windows, like for C++ and C99*/
8+
# include <stdint.h>
9+
#endif
10+
611
/* Integer types or the old good long. This part will have to be
712
reworked, obviously if we wanna some platform dependent stuff. */
813
#ifdef ZEND_ENABLE_INT64

ext/standard/php_array.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ PHP_FUNCTION(array_key_exists);
103103
PHP_FUNCTION(array_chunk);
104104
PHP_FUNCTION(array_combine);
105105

106-
PHPAPI HashTable* php_splice(HashTable *, int, int, zval ***, int, HashTable **);
106+
PHPAPI HashTable* php_splice(HashTable *, php_int_t, php_int_t, zval ***, php_int_t, HashTable **);
107107
PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive TSRMLS_DC);
108108
PHPAPI int php_array_replace_recursive(HashTable *dest, HashTable *src TSRMLS_DC);
109109
PHPAPI int php_multisort_compare(const void *a, const void *b TSRMLS_DC);

0 commit comments

Comments
 (0)