Move structure definition into its own file, so that public header

files don't need to include the complete source code.

3 files changed, 31 insertions, 6 deletions

diff --git a/ext/standard/php_smart_str.h b/ext/standard/php_smart_str.h
index bbce7317b7..6199051dad 100644
--- a/ext/standard/php_smart_str.h
+++ b/ext/standard/php_smart_str.h
@@ -19,6 +19,8 @@
 #ifndef PHP_SMART_STR_H
 #define PHP_SMART_STR_H
 
+#include "php_smart_str_public.h"
+
 #define smart_str_0(x) ((x)->c[(x)->len] = '\0')
 
 #define smart_str_alloc(d,n) {\
diff --git a/ext/standard/php_smart_str_public.h b/ext/standard/php_smart_str_public.h
new file mode 100644
index 0000000000..d561582369
--- /dev/null
+++ b/ext/standard/php_smart_str_public.h
@@ -0,0 +1,28 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP version 4.0                                                      |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.02 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.php.net/license/2_02.txt.                                 |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+   +----------------------------------------------------------------------+
+ */
+
+#ifndef PHP_SMART_STR_PUBLIC_H
+#define PHP_SMART_STR_PUBLIC_H
+
+typedef struct {
+	char *c;
+	size_t len;
+	size_t a;
+} smart_str;
+
+#endif
diff --git a/ext/standard/url_scanner_ex.h b/ext/standard/url_scanner_ex.h
index 8992326538..3653246a8b 100644
--- a/ext/standard/url_scanner_ex.h
+++ b/ext/standard/url_scanner_ex.h
@@ -24,12 +24,7 @@ PHP_RINIT_FUNCTION(url_scanner_ex);
 
 char *url_adapt_ext_ex(const char *src, size_t srclen, const char *name, const char *value, size_t *newlen);
 
-typedef struct {
-	char *c;
-	size_t len;
-	size_t a;
-} smart_str;
-
+#include "php_smart_str_public.h"
 
 typedef struct {
 	/* Used by the mainloop of the scanner */