cvs: php4 /ext ext_skel /ext/skeleton php_skeleton.h skeleton.c

sas Fri Dec 1 06:56:30 2000 EDT Modified files: /php4/ext ext_skel /php4/ext/skeleton php_skeleton.h skeleton.c Log: Get rid of HAVE_EXTNAME. This dates back to PHP 3 where source files were unconditionally compiled. It is not necessary in PHP 4. Index: php4/ext/ext_skel diff -u php4/ext/ext_skel:1.30 php4/ext/ext_skel:1.31 --- php4/ext/ext_skel:1.30 Fri Dec 1 04:13:59 2000 +++ php4/ext/ext_skel Fri Dec 1 06:56:29 2000 @@ -131,7 +131,6 @@ dnl If you will not be testing anything external, like existence of dnl headers, libraries or functions in them, just uncomment the dnl following line and you are ready to go. - dnl AC_DEFINE(HAVE_$EXTNAME, 1, [ ]) dnl Write more examples of tests here... PHP_EXTENSION($extname, \$ext_shared) fi Index: php4/ext/skeleton/php_skeleton.h diff -u php4/ext/skeleton/php_skeleton.h:1.13 php4/ext/skeleton/php_skeleton.h:1.14 --- php4/ext/skeleton/php_skeleton.h:1.13 Mon Nov 20 09:27:50 2000 +++ php4/ext/skeleton/php_skeleton.h Fri Dec 1 06:56:29 2000 @@ -3,11 +3,6 @@ #ifndef PHP_EXTNAME_H #define PHP_EXTNAME_H -/* You should tweak config.m4 so this symbol (or some else suitable) - gets defined. -*/ -#if HAVE_EXTNAME - extern zend_module_entry extname_module_entry; #define phpext_extname_ptr &extname_module_entry @@ -48,12 +43,6 @@ #else #define EXTNAMEG(v) (extname_globals.v) #define EXTNAMELS_FETCH() -#endif - -#else - -#define phpext_extname_ptr NULL - #endif #endif /* PHP_EXTNAME_H */ Index: php4/ext/skeleton/skeleton.c diff -u php4/ext/skeleton/skeleton.c:1.10 php4/ext/skeleton/skeleton.c:1.11 --- php4/ext/skeleton/skeleton.c:1.10 Thu Oct 5 13:48:12 2000 +++ php4/ext/skeleton/skeleton.c Fri Dec 1 06:56:30 2000 @@ -4,11 +4,6 @@ #include "php_ini.h" #include "php_extname.h" -/* You should tweak config.m4 so this symbol (or some else suitable) - gets defined. -*/ -#if HAVE_EXTNAME - /* If you declare any globals in php_extname.h uncomment this: ZEND_DECLARE_MODULE_GLOBALS(extname) */ @@ -113,7 +108,5 @@ */ /* __function_stubs_here__ */ - -#endif /* HAVE_EXTNAME */ /* __footer_here__ */