Fix Zend SmartStr

It can't use static functions in inline functions

Author: Girgias

Zend/zend_smart_str.c

@@ -73,6 +73,7 @@ static size_t zend_compute_escaped_string_len(const char *s, size_t l) {
 	return len;
 }
 
+/*
 extern ZEND_API inline void smart_str_appendl(smart_str *dest, const char *src, size_t length);
 extern ZEND_API inline void smart_str_appends_ex(smart_str *dest, const char *src, bool persistent);
 extern ZEND_API inline void smart_str_appends(smart_str *dest, const char *src);
@@ -83,7 +84,7 @@ extern ZEND_API inline void smart_str_free(smart_str *str);
 extern ZEND_API inline void smart_str_append_long(smart_str *dest, zend_long num);
 extern ZEND_API inline void smart_str_append_unsigned(smart_str *dest, zend_ulong num);
 extern ZEND_API inline void smart_str_sets(smart_str *dest, const char *src);
-
+*/
 
 ZEND_API void ZEND_FASTCALL smart_str_append_escaped(smart_str *str, const char *s, size_t l) {
 	char *res;

Zend/zend_smart_str.h

@@ -21,31 +21,6 @@
 #include "zend_globals.h"
 #include "zend_smart_str_public.h"
 
-ZEND_API inline void smart_str_appendl(smart_str *dest, const char *src, size_t length)
-{
-	smart_str_appendl_ex(dest, src, length, 0);
-}
-ZEND_API inline void smart_str_appends_ex(smart_str *dest, const char *src, bool persistent)
-{
-	smart_str_appendl_ex(dest, src, strlen(src), persistent);
-}
-ZEND_API inline void smart_str_appends(smart_str *dest, const char *src)
-{
-	smart_str_appendl_ex(dest, src, strlen(src), 0);
-}
-ZEND_API inline void smart_str_append(smart_str *dest, const zend_string *src)
-{
-	smart_str_append_ex(dest, src, 0);
-}
-ZEND_API inline void smart_str_appendc(smart_str *dest, char ch)
-{
-	smart_str_appendc_ex(dest, ch, 0);
-}
-ZEND_API inline void smart_str_append_smart_str(smart_str *dest, const smart_str *src)
-{
-	smart_str_append_smart_str_ex(dest, src, 0);
-}
-
 BEGIN_EXTERN_C()
 
 ZEND_API void ZEND_FASTCALL smart_str_erealloc(smart_str *str, size_t len);
@@ -80,7 +55,7 @@ static zend_always_inline char* smart_str_extend_ex(smart_str *dest, size_t len,
 	return ret;
 }
 
-ZEND_API inline char* smart_str_extend(smart_str *dest, size_t length)
+static inline char* smart_str_extend(smart_str *dest, size_t length)
 {
 	return smart_str_extend_ex(dest, length, 0);
 }
@@ -93,7 +68,7 @@ static zend_always_inline void smart_str_free_ex(smart_str *str, zend_bool persi
 	str->a = 0;
 }
 
-ZEND_API inline void smart_str_free(smart_str *str)
+static inline void smart_str_free(smart_str *str)
 {
 	smart_str_free_ex(str, 0);
 }
@@ -148,7 +123,7 @@ static zend_always_inline void smart_str_append_long_ex(smart_str *dest, zend_lo
 	smart_str_appendl_ex(dest, result, buf + sizeof(buf) - 1 - result, persistent);
 }
 
-ZEND_API inline void smart_str_append_long(smart_str *dest, zend_long num)
+static inline void smart_str_append_long(smart_str *dest, zend_long num)
 {
 	smart_str_append_long_ex(dest, num, 0);
 }
@@ -159,17 +134,42 @@ static zend_always_inline void smart_str_append_unsigned_ex(smart_str *dest, zen
 	smart_str_appendl_ex(dest, result, buf + sizeof(buf) - 1 - result, persistent);
 }
 
-ZEND_API inline void smart_str_append_unsigned(smart_str *dest, zend_ulong num)
+static inline void smart_str_append_unsigned(smart_str *dest, zend_ulong num)
 {
 	smart_str_append_unsigned_ex(dest, num, 0);
 }
 
+static inline void smart_str_appendl(smart_str *dest, const char *src, size_t length)
+{
+	smart_str_appendl_ex(dest, src, length, 0);
+}
+static inline void smart_str_appends_ex(smart_str *dest, const char *src, bool persistent)
+{
+	smart_str_appendl_ex(dest, src, strlen(src), persistent);
+}
+static inline void smart_str_appends(smart_str *dest, const char *src)
+{
+	smart_str_appendl_ex(dest, src, strlen(src), 0);
+}
+static inline void smart_str_append(smart_str *dest, const zend_string *src)
+{
+	smart_str_append_ex(dest, src, 0);
+}
+static inline void smart_str_appendc(smart_str *dest, char ch)
+{
+	smart_str_appendc_ex(dest, ch, 0);
+}
+static inline void smart_str_append_smart_str(smart_str *dest, const smart_str *src)
+{
+	smart_str_append_smart_str_ex(dest, src, 0);
+}
+
 static zend_always_inline void smart_str_setl(smart_str *dest, const char *src, size_t len) {
 	smart_str_free(dest);
 	smart_str_appendl(dest, src, len);
 }
 
-ZEND_API inline void smart_str_sets(smart_str *dest, const char *src)
+static inline void smart_str_sets(smart_str *dest, const char *src)
 {
 	smart_str_setl(dest, src, strlen(src));
 }