Use correct macro

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 37dc4a2cc1410d4c56a7c20e336447dba2cd3b60..3382f89be2d49ee3c0a4358bd4ac40723565505e 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -657,10 +657,10 @@ function_entry basic_functions[] = {
        PHP_FE(fgets,                                                                                                                   NULL)
        PHP_FE(fgetss,                                                                                                                  NULL)
        PHP_FE(fread,                                                                                                                   NULL)
-       PHP_STATIC_FE("fopen",                  php_if_fopen,                                                   NULL)
+       PHP_NAMED_FE(fopen,                             php_if_fopen,                                                   NULL)
        PHP_FE(fpassthru,                                                                                                               NULL)
-       PHP_STATIC_FE("ftruncate",              php_if_ftruncate,                                               NULL)
-       PHP_STATIC_FE("fstat",                  php_if_fstat,                                                   NULL)
+       PHP_NAMED_FE(ftruncate,                 php_if_ftruncate,                                               NULL)
+       PHP_NAMED_FE(fstat,                             php_if_fstat,                                                   NULL)
        PHP_FE(fseek,                                                                                                                   NULL)
        PHP_FE(ftell,                                                                                                                   NULL)
        PHP_FE(fflush,                                                                                                                  NULL)
@@ -670,7 +670,7 @@ function_entry basic_functions[] = {
        PHP_FE(rename,                                                                                                                  NULL)
        PHP_FE(copy,                                                                                                                    NULL)
        PHP_FE(tempnam,                                                                                                                 NULL)
-       PHP_STATIC_FE("tmpfile",                php_if_tmpfile,                                                 NULL)
+       PHP_NAMED_FE(tmpfile,                   php_if_tmpfile,                                                 NULL)
        PHP_FE(file,                                                                                                                    NULL)
        PHP_FE(file_get_contents,                                                                                               NULL)
        PHP_FE(file_put_contents,                                                                                               NULL)
@@ -746,7 +746,7 @@ function_entry basic_functions[] = {
 
        PHP_FE(getcwd,                                                                                                                  NULL)
        PHP_FE(rewinddir,                                                                                                               NULL)
-       PHP_STATIC_FE("readdir",                php_if_readdir,                                                 NULL)
+       PHP_NAMED_FE(readdir,                   php_if_readdir,                                                 NULL)
        PHP_FALIAS(dir,                                 getdir,                                                                 NULL)
        PHP_FE(scandir,                                                                                                                 NULL)
 #ifdef HAVE_GLOB
@@ -770,8 +770,8 @@ function_entry basic_functions[] = {
        PHP_FE(is_file,                                                                                                                 NULL)
        PHP_FE(is_dir,                                                                                                                  NULL)
        PHP_FE(is_link,                                                                                                                 NULL)
-       PHP_STATIC_FE("stat",                   php_if_stat,                                                    NULL)
-       PHP_STATIC_FE("lstat",                  php_if_lstat,                                                   NULL)
+       PHP_NAMED_FE(stat,                              php_if_stat,                                                    NULL)
+       PHP_NAMED_FE(lstat,                             php_if_lstat,                                                   NULL)
        PHP_FE(chown,                                                                                                                   NULL)
        PHP_FE(chgrp,                                                                                                                   NULL)
        PHP_FE(chmod,                                                                                                                   NULL)

diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index 285a4cfe0d034dee9fb337ad212aa64fefb28e32..40bb238a382111167556f8f784d3ab91c7953b08 100644 (file)
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -95,7 +95,7 @@ static zend_class_entry *dir_class_entry_ptr;
 static zend_function_entry php_dir_class_functions[] = {
        PHP_FALIAS(close,       closedir,       NULL)
        PHP_FALIAS(rewind,      rewinddir,      NULL)
-       PHP_STATIC_FE("read", php_if_readdir, NULL)
+       PHP_NAMED_FE(read,  php_if_readdir, NULL)
        {NULL, NULL, NULL}
 };