Skip to content

Commit

Permalink
Revert "Fixed bug that Yaf_Application::environ is undefined on windows"
Browse files Browse the repository at this point in the history
This reverts commit 605e0ec.
  • Loading branch information
laruence committed Sep 21, 2012
1 parent cfc1de5 commit 5289f77
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 12 deletions.
11 changes: 6 additions & 5 deletions package2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,21 @@
<email>[email protected]</email>
<active>yes</active>
</lead>
<date>2012-?-?</date>
<date>2012-09-14</date>
<time>16:56:28</time>
<version>
<release>2.2.3</release>
<api>2.2.3</api>
<release>2.2.2</release>
<api>2.2.2</api>
</version>
<stability>
<release>beta</release>
<api>beta</api>
</stability>
<license uri="http://www.php.net/license">PHP</license>
<notes>
- Fixed bug that Yaf_Application::environ is undefined on windows
- Improve warning message while script can not be loaded
- Yaf_Controller's methods are not final anymore
- Yaf_View_Simple is not final anymore
- Memleaks fixed in various place
</notes>
<contents>
<dir name="/">
Expand Down
6 changes: 1 addition & 5 deletions php_yaf.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
+----------------------------------------------------------------------+
*/

/* $Id: php_yaf.h 327716 2012-09-20 15:37:18Z laruence $ */
/* $Id: php_yaf.h 327650 2012-09-14 02:46:00Z laruence $ */

#ifndef PHP_YAF_H
#define PHP_YAF_H
Expand Down Expand Up @@ -59,10 +59,6 @@ extern zend_module_entry yaf_module_entry;
#define Z_DELREF_P ZVAL_DELREF
#endif

#ifdef environ
#undef environ
#endif

#define yaf_application_t zval
#define yaf_view_t zval
#define yaf_controller_t zval
Expand Down
2 changes: 1 addition & 1 deletion yaf.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
+----------------------------------------------------------------------+
*/

/* $Id: yaf.c 327715 2012-09-20 15:24:26Z laruence $ */
/* $Id: yaf.c 327580 2012-09-10 06:31:34Z laruence $ */

#ifdef HAVE_CONFIG_H
#include "config.h"
Expand Down
2 changes: 1 addition & 1 deletion yaf_application.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
+----------------------------------------------------------------------+
*/

/* $Id: yaf_application.c 327715 2012-09-20 15:24:26Z laruence $ */
/* $Id: yaf_application.c 327603 2012-09-11 03:27:16Z laruence $ */

#ifdef HAVE_CONFIG_H
#include "config.h"
Expand Down

0 comments on commit 5289f77

Please sign in to comment.