diff options
author | Anatol Belski <ab@php.net> | 2014-10-18 22:57:44 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-10-18 22:57:44 +0200 |
commit | d0151cfe0073991b3051875ded00bce19ecea009 (patch) | |
tree | 7ba053a3e9113dd083bd8ff05880659c1dc7feaa | |
parent | fb85d0322d39d49f37e32df6f68c9769f2cce0e4 (diff) | |
parent | 3af83e196c4b8f3d2c476b08472433f2b38b585d (diff) | |
download | php-git-d0151cfe0073991b3051875ded00bce19ecea009.tar.gz |
Merge branch 'PHP-5.6'
* PHP-5.6:
export functions needed for phpdbg
Conflicts:
main/snprintf.c
main/snprintf.h
-rw-r--r-- | main/snprintf.c | 4 | ||||
-rw-r--r-- | main/snprintf.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/main/snprintf.c b/main/snprintf.c index 062ccc4eee..b9f781346c 100644 --- a/main/snprintf.c +++ b/main/snprintf.c @@ -311,7 +311,7 @@ PHPAPI char *php_gcvt(double value, int ndigit, char dec_point, char exponent, c * is declared as buf[ 100 ], buf_end should be &buf[ 100 ]) */ /* char * ap_php_conv_10() {{{ */ -char * ap_php_conv_10(register wide_int num, register bool_int is_unsigned, +PHPAPI char * ap_php_conv_10(register wide_int num, register bool_int is_unsigned, register bool_int * is_negative, char *buf_end, register size_t *len) { register char *p = buf_end; @@ -474,7 +474,7 @@ PHPAPI char * php_conv_fp(register char format, register double num, * which is a pointer to the END of the buffer + 1 (i.e. if the buffer * is declared as buf[ 100 ], buf_end should be &buf[ 100 ]) */ -char * ap_php_conv_p2(register u_wide_int num, register int nbits, char format, char *buf_end, register size_t *len) /* {{{ */ +PHPAPI char * ap_php_conv_p2(register u_wide_int num, register int nbits, char format, char *buf_end, register size_t *len) /* {{{ */ { register int mask = (1 << nbits) - 1; register char *p = buf_end; diff --git a/main/snprintf.h b/main/snprintf.h index d133ad7aaa..789ab7d41a 100644 --- a/main/snprintf.h +++ b/main/snprintf.h @@ -153,10 +153,10 @@ typedef enum { typedef WIDE_INT wide_int; typedef unsigned WIDE_INT u_wide_int; -extern char * ap_php_conv_10(register wide_int num, register bool_int is_unsigned, +PHPAPI char * ap_php_conv_10(register wide_int num, register bool_int is_unsigned, register bool_int * is_negative, char *buf_end, register size_t *len); -extern char * ap_php_conv_p2(register u_wide_int num, register int nbits, +PHPAPI char * ap_php_conv_p2(register u_wide_int num, register int nbits, char format, char *buf_end, register size_t *len); /* The maximum precision that's allowed for float conversion. Does not include |