From c6bef8a0a8086e4325a37445cf816b6a5af57c28 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Fri, 18 Jan 2013 16:24:35 +0800 Subject: [PATCH] Fixed compile fails with VS --- config.m4 | 60 +++++++++---------- config.w32 | 4 +- configs/{ini.c => yaf_config_ini.c} | 3 +- configs/{ini.h => yaf_config_ini.h} | 0 configs/{simple.c => yaf_config_simple.c} | 3 +- configs/{simple.h => yaf_config_simple.h} | 0 requests/{http.c => yaf_request_http.c} | 4 +- requests/{http.h => yaf_request_http.h} | 0 requests/{simple.c => yaf_request_simple.c} | 2 +- requests/{simple.h => yaf_request_simple.h} | 0 .../cli.c => responses/yaf_response_cli.c | 3 +- .../cli.h => responses/yaf_response_cli.h | 0 .../http.c => responses/yaf_response_http.c | 3 +- .../http.h => responses/yaf_response_http.h | 0 routes/{interface.c => yaf_route_interface.c} | 14 ++--- routes/{interface.h => yaf_route_interface.h} | 0 routes/{map.c => yaf_route_map.c} | 30 +++++----- routes/{map.h => yaf_route_map.h} | 0 routes/{regex.c => yaf_route_regex.c} | 4 +- routes/{regex.h => yaf_route_regex.h} | 0 routes/{rewrite.c => yaf_route_rewrite.c} | 4 +- routes/{rewrite.h => yaf_route_rewrite.h} | 0 routes/{simple.c => yaf_route_simple.c} | 6 +- routes/{simple.h => yaf_route_simple.h} | 0 routes/{static.c => yaf_route_static.c} | 4 +- routes/{static.h => yaf_route_static.h} | 0 routes/{supervar.c => yaf_route_supervar.c} | 6 +- routes/{supervar.h => yaf_route_supervar.h} | 0 views/{interface.c => yaf_view_interface.c} | 2 +- views/{interface.h => yaf_view_interface.h} | 0 views/{simple.c => yaf_view_simple.c} | 4 +- views/{simple.h => yaf_view_simple.h} | 0 yaf.dsp | 30 +++++----- yaf_config.c | 4 +- yaf_request.c | 4 +- yaf_response.c | 4 +- yaf_router.c | 14 ++--- yaf_view.c | 4 +- 38 files changed, 111 insertions(+), 105 deletions(-) rename configs/{ini.c => yaf_config_ini.c} (99%) rename configs/{ini.h => yaf_config_ini.h} (100%) rename configs/{simple.c => yaf_config_simple.c} (99%) rename configs/{simple.h => yaf_config_simple.h} (100%) rename requests/{http.c => yaf_request_http.c} (99%) rename requests/{http.h => yaf_request_http.h} (100%) rename requests/{simple.c => yaf_request_simple.c} (99%) rename requests/{simple.h => yaf_request_simple.h} (100%) rename response/cli.c => responses/yaf_response_cli.c (97%) rename response/cli.h => responses/yaf_response_cli.h (100%) rename response/http.c => responses/yaf_response_http.c (98%) rename response/http.h => responses/yaf_response_http.h (100%) rename routes/{interface.c => yaf_route_interface.c} (95%) rename routes/{interface.h => yaf_route_interface.h} (100%) rename routes/{map.c => yaf_route_map.c} (84%) rename routes/{map.h => yaf_route_map.h} (100%) rename routes/{regex.c => yaf_route_regex.c} (99%) rename routes/{regex.h => yaf_route_regex.h} (100%) rename routes/{rewrite.c => yaf_route_rewrite.c} (99%) rename routes/{rewrite.h => yaf_route_rewrite.h} (100%) rename routes/{simple.c => yaf_route_simple.c} (98%) rename routes/{simple.h => yaf_route_simple.h} (100%) rename routes/{static.c => yaf_route_static.c} (98%) rename routes/{static.h => yaf_route_static.h} (100%) rename routes/{supervar.c => yaf_route_supervar.c} (96%) rename routes/{supervar.h => yaf_route_supervar.h} (100%) rename views/{interface.c => yaf_view_interface.c} (98%) rename views/{interface.h => yaf_view_interface.h} (100%) rename views/{simple.c => yaf_view_simple.c} (99%) rename views/{simple.h => yaf_view_simple.h} (100%) diff --git a/config.m4 b/config.m4 index 4119f114..7197ff91 100644 --- 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 index 29b604fd..f28c8234 100644 --- 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 b/configs/yaf_config_ini.c similarity index 99% rename from configs/ini.c rename to configs/yaf_config_ini.c index bdb74b08..75e237c7 100644 --- a/configs/ini.c +++ b/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 b/configs/yaf_config_ini.h similarity index 100% rename from configs/ini.h rename to configs/yaf_config_ini.h diff --git a/configs/simple.c b/configs/yaf_config_simple.c similarity index 99% rename from configs/simple.c rename to configs/yaf_config_simple.c index e919ea7b..186df66d 100644 --- a/configs/simple.c +++ b/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 b/configs/yaf_config_simple.h similarity index 100% rename from configs/simple.h rename to configs/yaf_config_simple.h diff --git a/requests/http.c b/requests/yaf_request_http.c similarity index 99% rename from requests/http.c rename to requests/yaf_request_http.c index 22d0dbb8..4dd6391a 100644 --- a/requests/http.c +++ b/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 b/requests/yaf_request_http.h similarity index 100% rename from requests/http.h rename to requests/yaf_request_http.h diff --git a/requests/simple.c b/requests/yaf_request_simple.c similarity index 99% rename from requests/simple.c rename to requests/yaf_request_simple.c index 82e48766..c7542b25 100644 --- a/requests/simple.c +++ b/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 b/requests/yaf_request_simple.h similarity index 100% rename from requests/simple.h rename to requests/yaf_request_simple.h diff --git a/response/cli.c b/responses/yaf_response_cli.c similarity index 97% rename from response/cli.c rename to responses/yaf_response_cli.c index 36d3b040..53e10d24 100644 --- a/response/cli.c +++ b/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 b/responses/yaf_response_cli.h similarity index 100% rename from response/cli.h rename to responses/yaf_response_cli.h diff --git a/response/http.c b/responses/yaf_response_http.c similarity index 98% rename from response/http.c rename to responses/yaf_response_http.c index 239de03a..d7bc1c2e 100644 --- a/response/http.c +++ b/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 b/responses/yaf_response_http.h similarity index 100% rename from response/http.h rename to responses/yaf_response_http.h diff --git a/routes/interface.c b/routes/yaf_route_interface.c similarity index 95% rename from routes/interface.c rename to routes/yaf_route_interface.c index 0d16ff12..6e77eda2 100644 --- a/routes/interface.c +++ b/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 b/routes/yaf_route_interface.h similarity index 100% rename from routes/interface.h rename to routes/yaf_route_interface.h diff --git a/routes/map.c b/routes/yaf_route_map.c similarity index 84% rename from routes/map.c rename to routes/yaf_route_map.c index be75b797..38c0a5c1 100644 --- a/routes/map.c +++ b/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 | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Xinchen Hui | - +----------------------------------------------------------------------+ + +----------------------------------------------------------------------+ + | 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 | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Author: Xinchen Hui | + +----------------------------------------------------------------------+ */ /* $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 b/routes/yaf_route_map.h similarity index 100% rename from routes/map.h rename to routes/yaf_route_map.h diff --git a/routes/regex.c b/routes/yaf_route_regex.c similarity index 99% rename from routes/regex.c rename to routes/yaf_route_regex.c index 345a8705..7f2d3c95 100644 --- a/routes/regex.c +++ b/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 b/routes/yaf_route_regex.h similarity index 100% rename from routes/regex.h rename to routes/yaf_route_regex.h diff --git a/routes/rewrite.c b/routes/yaf_route_rewrite.c similarity index 99% rename from routes/rewrite.c rename to routes/yaf_route_rewrite.c index acc769ca..f16ff246 100644 --- a/routes/rewrite.c +++ b/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 b/routes/yaf_route_rewrite.h similarity index 100% rename from routes/rewrite.h rename to routes/yaf_route_rewrite.h diff --git a/routes/simple.c b/routes/yaf_route_simple.c similarity index 98% rename from routes/simple.c rename to routes/yaf_route_simple.c index 126e15f7..6014a1e9 100644 --- a/routes/simple.c +++ b/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 b/routes/yaf_route_simple.h similarity index 100% rename from routes/simple.h rename to routes/yaf_route_simple.h diff --git a/routes/static.c b/routes/yaf_route_static.c similarity index 98% rename from routes/static.c rename to routes/yaf_route_static.c index ba04cfe8..cb92fff5 100644 --- a/routes/static.c +++ b/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 b/routes/yaf_route_static.h similarity index 100% rename from routes/static.h rename to routes/yaf_route_static.h diff --git a/routes/supervar.c b/routes/yaf_route_supervar.c similarity index 96% rename from routes/supervar.c rename to routes/yaf_route_supervar.c index 4baf17ef..e8679570 100644 --- a/routes/supervar.c +++ b/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 b/routes/yaf_route_supervar.h similarity index 100% rename from routes/supervar.h rename to routes/yaf_route_supervar.h diff --git a/views/interface.c b/views/yaf_view_interface.c similarity index 98% rename from views/interface.c rename to views/yaf_view_interface.c index a0644f63..41af2d99 100644 --- a/views/interface.c +++ b/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 b/views/yaf_view_interface.h similarity index 100% rename from views/interface.h rename to views/yaf_view_interface.h diff --git a/views/simple.c b/views/yaf_view_simple.c similarity index 99% rename from views/simple.c rename to views/yaf_view_simple.c index 0f9432b8..b3892c9d 100644 --- a/views/simple.c +++ b/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 b/views/yaf_view_simple.h similarity index 100% rename from views/simple.h rename to views/yaf_view_simple.h diff --git a/yaf.dsp b/yaf.dsp index a3bd7993..7c557f82 100644 --- a/yaf.dsp +++ b/yaf.dsp @@ -176,11 +176,11 @@ SOURCE=.\yaf_config.c # End Source File # Begin Source File -SOURCE=.\configs\ini.c +SOURCE=.\configs\yaf_config_ini.c # End Source File # Begin Source File -SOURCE=.\configs\simple.c +SOURCE=.\configs\yaf_config_simple.c # End Source File # Begin Source File @@ -200,11 +200,11 @@ SOURCE=.\yaf_view.c # End Source File # Begin Source File -SOURCE=.\views\interface.c +SOURCE=.\views\yaf_view_interface.c # End Source File # Begin Source File -SOURCE=.\views\simple.c +SOURCE=.\views\yaf_view_simple.c # End Source File # Begin Source File @@ -212,11 +212,11 @@ SOURCE=.\yaf_request.c # End Source File # Begin Source File -SOURCE=.\requests\http.c +SOURCE=.\requests\yaf_request_http.c # End Source File # Begin Source File -SOURCE=.\requests\simple.c +SOURCE=.\requests\yaf_request_simple.c # End Source File # Begin Source File @@ -224,11 +224,11 @@ SOURCE=.\yaf_response.c # End Source File # Begin Source File -SOURCE=.\response\cli.c +SOURCE=.\responses\yaf_response_cli.c # End Source File # Begin Source File -SOURCE=.\response\http.c +SOURCE=.\responses\yaf_response_http.c # End Source File # Begin Source File @@ -236,31 +236,31 @@ SOURCE=.\yaf_router.c # End Source File # Begin Source File -SOURCE=.\routes\interface.c +SOURCE=.\routes\yaf_route_interface.c # End Source File # Begin Source File -SOURCE=.\routes\static.c +SOURCE=.\routes\yaf_route_static.c # End Source File # Begin Source File -SOURCE=.\routes\simple.c +SOURCE=.\routes\yaf_route_simple.c # End Source File # Begin Source File -SOURCE=.\routes\supervar.c +SOURCE=.\routes\yaf_route_supervar.c # End Source File # Begin Source File -SOURCE=.\routes\regex.c +SOURCE=.\routes\yaf_route_regex.c # End Source File # Begin Source File -SOURCE=.\routes\rewrite.c +SOURCE=.\routes\yaf_route_rewrite.c # End Source File # Begin Source File -SOURCE=.\routes\map.c +SOURCE=.\routes\yaf_route_map.c # End Source File # Begin Source File diff --git a/yaf_config.c b/yaf_config.c index f38498b7..043e50cb 100644 --- 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; diff --git a/yaf_request.c b/yaf_request.c index 0ae8ccdc..17c01e92 100644 --- a/yaf_request.c +++ b/yaf_request.c @@ -29,8 +29,8 @@ #include "yaf_namespace.h" #include "yaf_exception.h" -#include "requests/simple.h" -#include "requests/http.h" +#include "requests/yaf_request_simple.h" +#include "requests/yaf_request_http.h" zend_class_entry *yaf_request_ce; diff --git a/yaf_response.c b/yaf_response.c index e35c45db..c3c7f379 100644 --- a/yaf_response.c +++ b/yaf_response.c @@ -30,8 +30,8 @@ #include "yaf_response.h" #include "yaf_exception.h" -#include "response/http.h" -#include "response/cli.h" +#include "responses/yaf_response_http.h" +#include "responses/yaf_response_cli.h" zend_class_entry *yaf_response_ce; diff --git a/yaf_router.c b/yaf_router.c index 35c40477..bdd3d72c 100644 --- a/yaf_router.c +++ b/yaf_router.c @@ -31,13 +31,13 @@ #include "yaf_router.h" #include "yaf_config.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_router_ce; diff --git a/yaf_view.c b/yaf_view.c index fc423d76..173d68b0 100644 --- a/yaf_view.c +++ b/yaf_view.c @@ -28,8 +28,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" /** {{{ yaf_view_t * yaf_view_instance(yaf_view_t *this_ptr TSRMLS_DC) */