diff options
Diffstat (limited to 'sapi/embed')
| -rw-r--r-- | sapi/embed/php_embed.c | 8 | ||||
| -rw-r--r-- | sapi/embed/php_embed.h | 20 |
2 files changed, 17 insertions, 11 deletions
diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index 112d55c30..e2ce93cec 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -2,12 +2,12 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2005 The PHP Group | + | Copyright (c) 1997-2006 The PHP Group | +----------------------------------------------------------------------+ - | This source file is subject to version 3.0 of the PHP license, | + | 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_0.txt. | + | 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. | @@ -15,7 +15,7 @@ | Author: Edin Kadribasic <edink@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_embed.c,v 1.11 2005/08/03 14:08:49 sniper Exp $ */ +/* $Id: php_embed.c,v 1.11.2.1 2006/01/01 12:50:19 sniper Exp $ */ #include "php_embed.h" diff --git a/sapi/embed/php_embed.h b/sapi/embed/php_embed.h index 6338f4fd0..bf1bcb936 100644 --- a/sapi/embed/php_embed.h +++ b/sapi/embed/php_embed.h @@ -2,12 +2,12 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2005 The PHP Group | + | Copyright (c) 1997-2006 The PHP Group | +----------------------------------------------------------------------+ - | This source file is subject to version 3.0 of the PHP license, | + | 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_0.txt. | + | 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. | @@ -15,7 +15,7 @@ | Author: Edin Kadribasic <edink@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_embed.h,v 1.6 2005/08/03 14:08:49 sniper Exp $ */ +/* $Id: php_embed.h,v 1.6.2.2 2006/01/01 12:50:19 sniper Exp $ */ #ifndef _PHP_EMBED_H_ #define _PHP_EMBED_H_ @@ -32,18 +32,24 @@ #define PTSRMLS_DC , PTSRMLS_D #define PTSRMLS_C &tsrm_ls #define PTSRMLS_CC , PTSRMLS_C + +#define PHP_EMBED_START_BLOCK(x,y) { \ + void ***tsrm_ls; \ + php_embed_init(x, y PTSRMLS_CC); \ + zend_first_try { + #else #define PTSRMLS_D #define PTSRMLS_DC #define PTSRMLS_C #define PTSRMLS_CC -#endif #define PHP_EMBED_START_BLOCK(x,y) { \ - void ***tsrm_ls; \ - php_embed_init(x, y PTSRMLS_CC); \ + php_embed_init(x, y); \ zend_first_try { +#endif + #define PHP_EMBED_END_BLOCK() \ } zend_catch { \ /* int exit_status = EG(exit_status); */ \ |