tidy up the headers (streams related)

main/fopen_wrappers.h

@@ -26,34 +26,15 @@
 #define USE_PATH		1
 #define IGNORE_URL		2
 /* There's no USE_URL. */
-#ifdef PHP_WIN32
-# define IGNORE_URL_WIN IGNORE_URL
-#else
-# define IGNORE_URL_WIN 0
-#endif
 #define ENFORCE_SAFE_MODE 4
-
 #define REPORT_ERRORS	8
 
 #ifdef PHP_WIN32
-# define SOCK_ERR INVALID_SOCKET
-# define SOCK_CONN_ERR SOCKET_ERROR
-# define SOCK_RECV_ERR SOCKET_ERROR
+# define IGNORE_URL_WIN IGNORE_URL
 #else
-# define SOCK_ERR -1
-# define SOCK_CONN_ERR -1
-# define SOCK_RECV_ERR -1
+# define IGNORE_URL_WIN 0
 #endif
 
-/* values for issock */
-#define IS_NOT_SOCKET	0
-#define IS_SOCKET		1
-#define BAD_URL			2
-
-typedef FILE *(*php_fopen_url_wrapper_t)(const char *, char *, int, int *, int *, char ** TSRMLS_DC);
-
-PHPAPI FILE *php_fopen_wrapper(char *filename, char *mode, int options, int *issock, int *socketd, char **opened_path TSRMLS_DC);
-
 PHPAPI int php_fopen_primary_script(zend_file_handle *file_handle TSRMLS_DC);
 PHPAPI char *expand_filepath(const char *filepath, char *real_path TSRMLS_DC);
 
@@ -67,12 +48,6 @@ PHPAPI FILE *php_fopen_with_path(char *filename, char *mode, char *path, char **
 PHPAPI int php_is_url(char *path);
 PHPAPI char *php_strip_url_passwd(char *path);
 
-
-int php_init_fopen_wrappers(TSRMLS_D);
-int php_shutdown_fopen_wrappers(TSRMLS_D);
-PHPAPI int php_register_url_wrapper(const char *protocol, php_fopen_url_wrapper_t wrapper TSRMLS_DC);
-PHPAPI int php_unregister_url_wrapper(char *protocol TSRMLS_DC);
-
 #endif
 /*
  * Local variables:

main/php_network.h

@@ -63,6 +63,16 @@
 #include <stddef.h>
 #endif
 
+#ifdef PHP_WIN32
+# define SOCK_ERR INVALID_SOCKET
+# define SOCK_CONN_ERR SOCKET_ERROR
+# define SOCK_RECV_ERR SOCKET_ERROR
+#else
+# define SOCK_ERR -1
+# define SOCK_CONN_ERR -1
+# define SOCK_RECV_ERR -1
+#endif
+
 #ifdef HAVE_SOCKADDR_STORAGE
 typedef struct sockaddr_storage php_sockaddr_storage;
 #else