diff options
Diffstat (limited to 'ext/standard/basic_functions.h')
| -rw-r--r-- | ext/standard/basic_functions.h | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h index 3b69da043b..e37bca31d6 100644 --- a/ext/standard/basic_functions.h +++ b/ext/standard/basic_functions.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -149,20 +149,12 @@ PHPAPI int _php_error_log(int opt_err, char *message, char *opt, char *headers); PHPAPI int _php_error_log_ex(int opt_err, char *message, size_t message_len, char *opt, char *headers); PHPAPI int php_prefix_varname(zval *result, zval *prefix, char *var_name, size_t var_name_len, zend_bool add_underscore); -#if SIZEOF_INT == 4 -/* Most 32-bit and 64-bit systems have 32-bit ints */ -typedef unsigned int php_uint32; -typedef signed int php_int32; -#elif SIZEOF_LONG == 4 -/* 16-bit systems? */ -typedef unsigned long php_uint32; -typedef signed long php_int32; -#else -#error Need type which holds 32 bits -#endif - #define MT_N (624) +/* Deprecated type aliases -- use the standard types instead */ +typedef uint32_t php_uint32; +typedef int32_t php_int32; + typedef struct _php_basic_globals { HashTable *user_shutdown_function_names; HashTable putenv_ht; @@ -193,8 +185,8 @@ typedef struct _php_basic_globals { php_stream_statbuf ssb, lssb; /* rand.c */ - php_uint32 state[MT_N+1]; /* state vector + 1 extra to not violate ANSI C */ - php_uint32 *next; /* next random value is computed from here */ + uint32_t state[MT_N+1]; /* state vector + 1 extra to not violate ANSI C */ + uint32_t *next; /* next random value is computed from here */ int left; /* can *next++ this many times before reloading */ unsigned int rand_seed; /* Seed for rand(), in ts version */ |