diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/confutils.js | 2 | ||||
| -rw-r--r-- | win32/php_stdint.h | 4 | ||||
| -rw-r--r-- | win32/registry.c | 2 | ||||
| -rw-r--r-- | win32/sendmail.h | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 8da760406c..2151361368 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -1499,7 +1499,7 @@ function output_as_table(header, ar_out) {
var l = header.length;
var cols = 80;
- var fixedlenght = "";
+ var fixedlength = "";
var t = 0;
var i,j,k,m;
var out = "| ";
diff --git a/win32/php_stdint.h b/win32/php_stdint.h index 5df1df4777..0d63615c6b 100644 --- a/win32/php_stdint.h +++ b/win32/php_stdint.h @@ -66,8 +66,12 @@ // 7.18.1 Integer types // 7.18.1.1 Exact-width integer types +#ifndef int8_t typedef __int8 int8_t; +#endif +#ifndef int16_t typedef __int16 int16_t; +#endif #ifndef int32_t typedef __int32 int32_t; #endif diff --git a/win32/registry.c b/win32/registry.c index 685a09d084..9f8782aff2 100644 --- a/win32/registry.c +++ b/win32/registry.c @@ -261,7 +261,7 @@ void UpdateIniFromRegistry(char *path TSRMLS_DC) zend_hash_get_current_data_ex(ht, (void**)&data, &pos) == SUCCESS && zend_hash_get_current_key_ex(ht, &index, &index_len, &num, 0, &pos) == HASH_KEY_IS_STRING; zend_hash_move_forward_ex(ht, &pos)) { - zend_alter_ini_entry(index, index_len, Z_STRVAL_PP(data), Z_STRLEN_PP(data), PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE); + zend_alter_ini_entry(index, index_len, Z_STRVAL_PP(data), Z_STRLEN_PP(data), PHP_INI_USER, PHP_INI_STAGE_ACTIVATE); } break; } diff --git a/win32/sendmail.h b/win32/sendmail.h index 0a7698e2fe..6fed77ea06 100644 --- a/win32/sendmail.h +++ b/win32/sendmail.h @@ -5,7 +5,7 @@ #endif #define HOST_NAME_LEN 256 -#define MAX_APPNAME_LENGHT 100 +#define MAX_APPNAME_LENGTH 100 #define MAIL_BUFFER_SIZE (1024*4) /* 4k buffer */ /* Return values */ #define MIN_ERROR_INDEX 0 /* Always 0 like SUCCESS */ |