Fixed compile fails with VS

taochangle · Jan 18, 2013 · c6bef8a · c6bef8a
1 parent ce86d18
commit c6bef8a
Show file tree

Hide file tree

Showing 38 changed files with 111 additions and 105 deletions.
diff --git a/config.m4 b/config.m4
@@ -42,36 +42,36 @@ if test "$PHP_YAF" != "no"; then
     AC_MSG_RESULT([$php_version, ok])
   fi
   PHP_NEW_EXTENSION(yaf, 
-    yaf.c \
-    yaf_application.c   \
-    yaf_bootstrap.c     \
-    yaf_dispatcher.c    \
-    yaf_exception.c     \
-    yaf_config.c        \
-    configs/ini.c       \
-    configs/simple.c    \
-    yaf_request.c       \
-    requests/http.c     \
-    requests/simple.c   \
-    yaf_response.c      \
-    response/http.c     \
-    response/cli.c      \
-    yaf_view.c          \
-    views/interface.c   \
-    views/simple.c      \
-    yaf_controller.c    \
-    yaf_action.c        \
-    yaf_router.c        \
-    routes/interface.c  \
-    routes/static.c     \
-    routes/simple.c     \
-    routes/supervar.c   \
-    routes/regex.c      \
-    routes/rewrite.c    \ 
-    routes/map.c        \
-    yaf_loader.c        \
-    yaf_registry.c      \
-    yaf_plugin.c        \
+    yaf.c                           \
+    yaf_application.c               \
+    yaf_bootstrap.c                 \
+    yaf_dispatcher.c                \
+    yaf_exception.c                 \
+    yaf_config.c                    \
+    configs/yaf_config_ini.c        \
+    configs/yaf_config_simple.c     \
+    yaf_request.c                   \
+    requests/yaf_request_http.c     \
+    requests/yaf_request_simple.c   \
+    yaf_response.c                  \
+    responses/yaf_response_http.c   \
+    responses/yaf_response_cli.c    \
+    yaf_view.c                      \
+    views/yaf_view_interface.c      \
+    views/yaf_view_simple.c         \
+    yaf_controller.c                \
+    yaf_action.c                    \
+    yaf_router.c                    \
+    routes/yaf_route_interface.c    \
+    routes/yaf_route_static.c       \
+    routes/yaf_route_simple.c       \
+    routes/yaf_route_supervar.c     \
+    routes/yaf_route_regex.c        \
+    routes/yaf_route_rewrite.c      \ 
+    routes/yaf_route_map.c          \
+    yaf_loader.c                    \
+    yaf_registry.c                  \
+    yaf_plugin.c                    \
     yaf_session.c,
   $ext_shared)
 fi
diff --git a/config.w32 b/config.w32
@@ -4,6 +4,8 @@
 ARG_ENABLE("yaf", "enable yaf support", "no");
 
 if (PHP_YAF == "yes") {
-	EXTENSION("yaf", "yaf.c yaf_application.c yaf_bootstrap.c yaf_dispatcher.c yaf_exception.c yaf_config.c configs/ini.c configs/simple.c yaf_request.c requests/http.c requests/simple.c yaf_response.c response/http.c response/cli.c yaf_view.c views/interface.c views/simple.c yaf_controller.c yaf_action.c yaf_router.c routes/interface.c routes/static.c routes/simple.c routes/supervar.c routes/regex.c routes/rewrite.c routes/map.c yaf_loader.c yaf_registry.c yaf_plugin.c yaf_session.c");
+
+	EXTENSION("yaf", "yaf.c yaf_application.c yaf_bootstrap.c yaf_dispatcher.c yaf_exception.c yaf_config.c configs/yaf_config_ini.c configs/yaf_config_simple.c yaf_request.c requests/yaf_request_http.c requests/yaf_request_simple.c yaf_response.c responses/yaf_response_http.c responses/yaf_response_cli.c yaf_view.c views/yaf_view_interface.c views/yaf_view_simple.c yaf_controller.c yaf_action.c yaf_router.c routes/yaf_route_interface.c routes/yaf_route_static.c routes/yaf_route_simple.c routes/yaf_route_supervar.c routes/yaf_route_regex.c routes/yaf_route_rewrite.c routes/yaf_route_map.c yaf_loader.c yaf_registry.c yaf_plugin.c yaf_session.c");
+
     AC_DEFINE("HAVE_YAF", 1, "Have Yaf Support");
 }
diff --git a/configs/ini.c → configs/yaf_config_ini.c b/configs/ini.c → configs/yaf_config_ini.c
@@ -28,7 +28,8 @@
 #include "yaf_namespace.h"
 #include "yaf_exception.h"
 #include "yaf_config.h"
-#include "configs/ini.h"
+
+#include "configs/yaf_config_ini.h"
 
 zend_class_entry *yaf_config_ini_ce;
 

diff --git a/configs/ini.h → configs/yaf_config_ini.h b/configs/ini.h → configs/yaf_config_ini.h
diff --git a/configs/simple.c → configs/yaf_config_simple.c b/configs/simple.c → configs/yaf_config_simple.c
@@ -27,7 +27,8 @@
 #include "yaf_namespace.h"
 #include "yaf_exception.h"
 #include "yaf_config.h"
-#include "configs/simple.h"
+
+#include "configs/yaf_config_simple.h"
 
 zend_class_entry *yaf_config_simple_ce;
 

diff --git a/configs/simple.h → configs/yaf_config_simple.h b/configs/simple.h → configs/yaf_config_simple.h
diff --git a/requests/http.c → requests/yaf_request_http.c b/requests/http.c → requests/yaf_request_http.c
@@ -22,14 +22,14 @@
 
 #include "php.h"
 #include "main/SAPI.h"
+#include "ext/standard/url.h" /* for php_url */
 
 #include "php_yaf.h"
 #include "yaf_namespace.h"
 #include "yaf_request.h"
 #include "yaf_exception.h"
-#include "requests/http.h"
 
-#include "ext/standard/url.h" /* for php_url */
+#include "requests/yaf_request_http.h"
 
 static zend_class_entry * yaf_request_http_ce;
 

diff --git a/requests/http.h → requests/yaf_request_http.h b/requests/http.h → requests/yaf_request_http.h
diff --git a/requests/simple.c → requests/yaf_request_simple.c b/requests/simple.c → requests/yaf_request_simple.c
@@ -27,7 +27,7 @@
 #include "yaf_namespace.h"
 #include "yaf_request.h"
 #include "yaf_exception.h"
-#include "requests/simple.h"
+#include "requests/yaf_request_simple.h"
 
 static zend_class_entry *yaf_request_simple_ce;
 

diff --git a/requests/simple.h → requests/yaf_request_simple.h b/requests/simple.h → requests/yaf_request_simple.h
diff --git a/response/cli.c → responses/yaf_response_cli.c b/response/cli.c → responses/yaf_response_cli.c
@@ -26,7 +26,8 @@
 #include "yaf_namespace.h"
 #include "yaf_response.h"
 #include "yaf_exception.h"
-#include "response/cli.h"
+
+#include "responses/yaf_response_cli.h"
 
 zend_class_entry * yaf_response_cli_ce;
 

diff --git a/response/cli.h → responses/yaf_response_cli.h b/response/cli.h → responses/yaf_response_cli.h
diff --git a/response/http.c → responses/yaf_response_http.c b/response/http.c → responses/yaf_response_http.c
@@ -26,7 +26,8 @@
 #include "yaf_namespace.h"
 #include "yaf_response.h"
 #include "yaf_exception.h"
-#include "response/http.h"
+
+#include "responses/yaf_response_http.h"
 
 zend_class_entry *yaf_response_http_ce;
 

diff --git a/response/http.h → responses/yaf_response_http.h b/response/http.h → responses/yaf_response_http.h
diff --git a/routes/interface.c → routes/yaf_route_interface.c b/routes/interface.c → routes/yaf_route_interface.c
@@ -28,13 +28,13 @@
 #include "yaf_exception.h"
 #include "yaf_router.h"
 
-#include "routes/interface.h"
-#include "routes/static.h"
-#include "routes/simple.h"
-#include "routes/supervar.h"
-#include "routes/regex.h"
-#include "routes/rewrite.h"
-#include "routes/map.h"
+#include "routes/yaf_route_interface.h"
+#include "routes/yaf_route_static.h"
+#include "routes/yaf_route_simple.h"
+#include "routes/yaf_route_supervar.h"
+#include "routes/yaf_route_regex.h"
+#include "routes/yaf_route_rewrite.h"
+#include "routes/yaf_route_map.h"
 
 zend_class_entry *yaf_route_ce;
 

diff --git a/routes/interface.h → routes/yaf_route_interface.h b/routes/interface.h → routes/yaf_route_interface.h
diff --git a/routes/map.c → routes/yaf_route_map.c b/routes/map.c → routes/yaf_route_map.c
@@ -1,17 +1,17 @@
 /*
-   +----------------------------------------------------------------------+
-   | Yet Another Framework                                                |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.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          |
-   | [email protected] so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Author: Xinchen Hui  <[email protected]>                              |
-   +----------------------------------------------------------------------+
+  +----------------------------------------------------------------------+
+  | Yet Another Framework                                                |
+  +----------------------------------------------------------------------+
+  | This source file is subject to version 3.01 of the PHP license,      |
+  | that is bundled with this package in the file LICENSE, and is        |
+  | available through the world-wide-web at the following url:           |
+  | http://www.php.net/license/3_01.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          |
+  | [email protected] so we can mail you a copy immediately.               |
+  +----------------------------------------------------------------------+
+  | Author: Xinchen Hui  <[email protected]>                              |
+  +----------------------------------------------------------------------+
 */
 
 /* $Id: map.c 329197 2013-01-18 05:55:37Z laruence $*/
@@ -29,8 +29,8 @@
 #include "yaf_request.h"
 
 #include "yaf_router.h"
-#include "routes/interface.h"
-#include "routes/map.h"
+#include "routes/yaf_route_interface.h"
+#include "routes/yaf_route_map.h"
 
 zend_class_entry *yaf_route_map_ce;
 

diff --git a/routes/map.h → routes/yaf_route_map.h b/routes/map.h → routes/yaf_route_map.h
diff --git a/routes/regex.c → routes/yaf_route_regex.c b/routes/regex.c → routes/yaf_route_regex.c
@@ -29,8 +29,8 @@
 #include "yaf_request.h"
 
 #include "yaf_router.h"
-#include "routes/interface.h"
-#include "routes/regex.h"
+#include "routes/yaf_route_interface.h"
+#include "routes/yaf_route_regex.h"
 
 zend_class_entry *yaf_route_regex_ce;
 

diff --git a/routes/regex.h → routes/yaf_route_regex.h b/routes/regex.h → routes/yaf_route_regex.h
diff --git a/routes/rewrite.c → routes/yaf_route_rewrite.c b/routes/rewrite.c → routes/yaf_route_rewrite.c
@@ -30,8 +30,8 @@
 #include "yaf_request.h"
 
 #include "yaf_router.h"
-#include "routes/interface.h"
-#include "routes/rewrite.h"
+#include "routes/yaf_route_interface.h"
+#include "routes/yaf_route_rewrite.h"
 
 zend_class_entry *yaf_route_rewrite_ce;
 

diff --git a/routes/rewrite.h → routes/yaf_route_rewrite.h b/routes/rewrite.h → routes/yaf_route_rewrite.h
diff --git a/routes/simple.c → routes/yaf_route_simple.c b/routes/simple.c → routes/yaf_route_simple.c
@@ -27,10 +27,10 @@
 #include "yaf_exception.h"
 #include "yaf_application.h" /* for yaf_application_is_module_name */
 #include "yaf_request.h"
-
 #include "yaf_router.h"
-#include "routes/interface.h"
-#include "routes/simple.h"
+
+#include "routes/yaf_route_interface.h"
+#include "routes/yaf_route_simple.h"
 
 zend_class_entry *yaf_route_simple_ce;
 

diff --git a/routes/simple.h → routes/yaf_route_simple.h b/routes/simple.h → routes/yaf_route_simple.h
diff --git a/routes/static.c → routes/yaf_route_static.c b/routes/static.c → routes/yaf_route_static.c
@@ -29,8 +29,8 @@
 #include "yaf_request.h"
 
 #include "yaf_router.h"
-#include "routes/interface.h"
-#include "routes/static.h"
+#include "routes/yaf_route_interface.h"
+#include "routes/yaf_route_static.h"
 
 zend_class_entry * yaf_route_static_ce;
 

diff --git a/routes/static.h → routes/yaf_route_static.h b/routes/static.h → routes/yaf_route_static.h
diff --git a/routes/supervar.c → routes/yaf_route_supervar.c b/routes/supervar.c → routes/yaf_route_supervar.c
@@ -28,9 +28,9 @@
 #include "yaf_request.h"
 
 #include "yaf_router.h"
-#include "routes/interface.h"
-#include "routes/static.h" /* for yaf_route_pathinfo_route */
-#include "routes/supervar.h"
+#include "routes/yaf_route_interface.h"
+#include "routes/yaf_route_static.h" /* for yaf_route_pathinfo_route */
+#include "routes/yaf_route_supervar.h"
 
 zend_class_entry *yaf_route_supervar_ce;
 

diff --git a/routes/supervar.h → routes/yaf_route_supervar.h b/routes/supervar.h → routes/yaf_route_supervar.h
diff --git a/views/interface.c → views/yaf_view_interface.c b/views/interface.c → views/yaf_view_interface.c
@@ -28,7 +28,7 @@
 #include "yaf_loader.h"
 #include "yaf_view.h"
 
-#include "views/interface.h"
+#include "views/yaf_view_interface.h"
 
 zend_class_entry *yaf_view_interface_ce;
 

diff --git a/views/interface.h → views/yaf_view_interface.h b/views/interface.h → views/yaf_view_interface.h
diff --git a/views/simple.c → views/yaf_view_simple.c b/views/simple.c → views/yaf_view_simple.c
@@ -29,8 +29,8 @@
 #include "yaf_loader.h"
 #include "yaf_view.h"
 
-#include "views/interface.h"
-#include "views/simple.h"
+#include "views/yaf_view_interface.h"
+#include "views/yaf_view_simple.h"
 
 zend_class_entry *yaf_view_simple_ce;
 

diff --git a/views/simple.h → views/yaf_view_simple.h b/views/simple.h → views/yaf_view_simple.h
diff --git a/yaf.dsp b/yaf.dsp
diff --git a/yaf_config.c b/yaf_config.c
@@ -29,8 +29,8 @@
 #include "yaf_exception.h"
 #include "yaf_config.h"
 
-#include "configs/ini.h"
-#include "configs/simple.h"
+#include "configs/yaf_config_ini.h"
+#include "configs/yaf_config_simple.h"
 
 zend_class_entry *yaf_config_ce;