From: Anatol Belski <ab@php.net>
Date: Sat, 18 Oct 2014 20:57:44 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_NATIVE_TLS_MERGE~103^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0151cfe0073991b3051875ded00bce19ecea009;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  export functions needed for phpdbg

Conflicts:
	main/snprintf.c
	main/snprintf.h
---

d0151cfe0073991b3051875ded00bce19ecea009
diff --cc main/snprintf.c
index 062ccc4eee,2a452ef1f3..b9f781346c
--- a/main/snprintf.c
+++ b/main/snprintf.c
@@@ -311,8 -311,8 +311,8 @@@ PHPAPI char *php_gcvt(double value, in
   * 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 int *len)
 +	   register bool_int * is_negative, char *buf_end, register size_t *len)
  {
  	register char *p = buf_end;
  	register u_wide_int magnitude;
@@@ -474,7 -474,7 +474,7 @@@ PHPAPI char * php_conv_fp(register cha
   * 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 int *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 --cc main/snprintf.h
index d133ad7aaa,f44659322a..789ab7d41a
--- a/main/snprintf.h
+++ b/main/snprintf.h
@@@ -153,11 -152,11 +153,11 @@@ 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 int *len);
 +	   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 int *len);
 +		 char format, char *buf_end, register size_t *len);
  
  /* The maximum precision that's allowed for float conversion. Does not include
   * decimal separator, exponent, sign, terminator. Currently does not affect