diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-01-02 09:42:03 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-01-02 09:42:03 +0000 |
| commit | f8b291d2885c7b9a92d6a1af9f630ad619e4c875 (patch) | |
| tree | f12fa8ebef15c2aeb9048df2bb55300df6a0a948 /ext/standard/php_smart_string_public.h | |
| parent | 8c5647eef1f456e969cb815bbb1b3e51535804e8 (diff) | |
| parent | f3f594a47d63e993595ad344614cee4a910305b1 (diff) | |
| download | php-git-f8b291d2885c7b9a92d6a1af9f630ad619e4c875.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Switch reflection to use smart_str
Add smart_str_append_printf
Make printf_to_smart_str(ing) the primitive printf operation
Export zend_s(tr)pprintf
Sync smart_string implementation with smart_str
Move smart_string to Zend
Fixed bug #73154
Flush stderr on win32 in cli_log_message
Fixed bug #73154
Diffstat (limited to 'ext/standard/php_smart_string_public.h')
| -rw-r--r-- | ext/standard/php_smart_string_public.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/ext/standard/php_smart_string_public.h b/ext/standard/php_smart_string_public.h index dabc359676..2696d4eb0d 100644 --- a/ext/standard/php_smart_string_public.h +++ b/ext/standard/php_smart_string_public.h @@ -17,17 +17,6 @@ +----------------------------------------------------------------------+ */ -/* $Id$ */ +/* Header moved to Zend. This file is retained for BC. */ +#include "zend_smart_string_public.h" -#ifndef PHP_SMART_STRING_PUBLIC_H -#define PHP_SMART_STRING_PUBLIC_H - -#include <sys/types.h> - -typedef struct { - char *c; - size_t len; - size_t a; -} smart_string; - -#endif |