summaryrefslogtreecommitdiff
path: root/ext/ncurses
diff options
context:
space:
mode:
Diffstat (limited to 'ext/ncurses')
-rw-r--r--ext/ncurses/ncurses.c6
-rw-r--r--ext/ncurses/ncurses_fe.c8
-rw-r--r--ext/ncurses/ncurses_functions.c40
-rw-r--r--ext/ncurses/php_ncurses.h8
-rw-r--r--ext/ncurses/php_ncurses_fe.h6
5 files changed, 34 insertions, 34 deletions
diff --git a/ext/ncurses/ncurses.c b/ext/ncurses/ncurses.c
index 1c1516236..2216ec413 100644
--- a/ext/ncurses/ncurses.c
+++ b/ext/ncurses/ncurses.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. |
diff --git a/ext/ncurses/ncurses_fe.c b/ext/ncurses/ncurses_fe.c
index 59f0a8b0e..db5aaee21 100644
--- a/ext/ncurses/ncurses_fe.c
+++ b/ext/ncurses/ncurses_fe.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. |
@@ -50,7 +50,7 @@ static
*
* Every user visible function must have an entry in ncurses_functions[].
*/
-function_entry ncurses_functions[] = {
+zend_function_entry ncurses_functions[] = {
PHP_FE(ncurses_addch, NULL)
#ifdef HAVE_NCURSES_COLOR_SET
PHP_FE(ncurses_color_set, NULL)
diff --git a/ext/ncurses/ncurses_functions.c b/ext/ncurses/ncurses_functions.c
index 096c9b7c5..fd3e0e82e 100644
--- a/ext/ncurses/ncurses_functions.c
+++ b/ext/ncurses/ncurses_functions.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. |
@@ -1824,7 +1824,7 @@ PHP_FUNCTION(ncurses_getmouse)
}
IS_NCURSES_INITIALIZED();
- pval_destructor(arg);
+ zval_dtor(arg);
array_init(arg);
retval = getmouse(&mevent);
@@ -1843,7 +1843,7 @@ PHP_FUNCTION(ncurses_getmouse)
Pushes mouse event to queue */
PHP_FUNCTION(ncurses_ungetmouse)
{
- zval *arg, **pvalue;
+ zval *arg, **zvalue;
MEVENT mevent;
ulong retval;
@@ -1852,29 +1852,29 @@ PHP_FUNCTION(ncurses_ungetmouse)
}
IS_NCURSES_INITIALIZED();
- if (zend_hash_find(Z_ARRVAL_P(arg), "id", sizeof("id"), (void **) &pvalue) == SUCCESS) {
- convert_to_long_ex(pvalue);
- mevent.id = Z_LVAL_PP(pvalue);
+ if (zend_hash_find(Z_ARRVAL_P(arg), "id", sizeof("id"), (void **) &zvalue) == SUCCESS) {
+ convert_to_long_ex(zvalue);
+ mevent.id = Z_LVAL_PP(zvalue);
}
- if (zend_hash_find(Z_ARRVAL_P(arg), "x", sizeof("x"), (void **) &pvalue) == SUCCESS) {
- convert_to_long_ex(pvalue);
- mevent.x = Z_LVAL_PP(pvalue);
+ if (zend_hash_find(Z_ARRVAL_P(arg), "x", sizeof("x"), (void **) &zvalue) == SUCCESS) {
+ convert_to_long_ex(zvalue);
+ mevent.x = Z_LVAL_PP(zvalue);
}
- if (zend_hash_find(Z_ARRVAL_P(arg), "y", sizeof("y"), (void **) &pvalue) == SUCCESS) {
- convert_to_long_ex(pvalue);
- mevent.y = Z_LVAL_PP(pvalue);
+ if (zend_hash_find(Z_ARRVAL_P(arg), "y", sizeof("y"), (void **) &zvalue) == SUCCESS) {
+ convert_to_long_ex(zvalue);
+ mevent.y = Z_LVAL_PP(zvalue);
}
- if (zend_hash_find(Z_ARRVAL_P(arg), "z", sizeof("z"), (void **) &pvalue) == SUCCESS) {
- convert_to_long_ex(pvalue);
- mevent.z = Z_LVAL_PP(pvalue);
+ if (zend_hash_find(Z_ARRVAL_P(arg), "z", sizeof("z"), (void **) &zvalue) == SUCCESS) {
+ convert_to_long_ex(zvalue);
+ mevent.z = Z_LVAL_PP(zvalue);
}
- if (zend_hash_find(Z_ARRVAL_P(arg), "mmask", sizeof("mmask"), (void **) &pvalue) == SUCCESS) {
- convert_to_long_ex(pvalue);
- mevent.bstate = Z_LVAL_PP(pvalue);
+ if (zend_hash_find(Z_ARRVAL_P(arg), "mmask", sizeof("mmask"), (void **) &zvalue) == SUCCESS) {
+ convert_to_long_ex(zvalue);
+ mevent.bstate = Z_LVAL_PP(zvalue);
}
retval = ungetmouse(&mevent);
diff --git a/ext/ncurses/php_ncurses.h b/ext/ncurses/php_ncurses.h
index 6b0ebcce6..a9910f1b9 100644
--- a/ext/ncurses/php_ncurses.h
+++ b/ext/ncurses/php_ncurses.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. |
@@ -36,7 +36,7 @@ extern int le_ncurses_panels;
extern zend_module_entry ncurses_module_entry;
#define phpext_ncurses_ptr &ncurses_module_entry
-extern function_entry ncurses_functions[];
+extern zend_function_entry ncurses_functions[];
#include "php_ncurses_fe.h"
#ifdef PHP_WIN32
diff --git a/ext/ncurses/php_ncurses_fe.h b/ext/ncurses/php_ncurses_fe.h
index 3397d9cbd..42eb203fe 100644
--- a/ext/ncurses/php_ncurses_fe.h
+++ b/ext/ncurses/php_ncurses_fe.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. |