Re: cvs: php4 /ext/mcrypt mcrypt.c

Hi, thx Sacha, just wanted to commit the same things as you. So it must be ok :-) Derick Sascha Schumann wrote: > sas Mon Aug 14 12:26:09 2000 EDT > > Modified files: > /php4/ext/mcrypt mcrypt.c > Log: > Restrict INI entries when compiling against libmcrypt 2.4. > > > Index: php4/ext/mcrypt/mcrypt.c > diff -u php4/ext/mcrypt/mcrypt.c:1.37 php4/ext/mcrypt/mcrypt.c:1.38 > --- php4/ext/mcrypt/mcrypt.c:1.37 Sun Aug 13 04:53:04 2000 > +++ php4/ext/mcrypt/mcrypt.c Mon Aug 14 12:26:09 2000 > @@ -237,14 +237,16 @@ > #define MCRYPT_ENTRY2_4(a) MCRYPT_ENTRY_NAMED(a, a) > #endif > > +#if HAVE_LIBMCRYPT24 > PHP_INI_BEGIN() > STD_PHP_INI_ENTRY("mcrypt.algorithms_dir", NULL, PHP_INI_ALL, > OnUpdateString, algorithms_dir, zend_mcrypt_globals, mcrypt_globals) > STD_PHP_INI_ENTRY("mcrypt.modes_dir", NULL, PHP_INI_ALL, OnUpdateString, > modes_dir, zend_mcrypt_globals, mcrypt_globals) > PHP_INI_END() > +#endif > > static PHP_MINIT_FUNCTION(mcrypt) > { > -#ifdef ZTS > +#if defined(ZTS) && defined(HAVE_LIBMCRYPT24) > ZEND_INIT_MODULE_GLOBALS(mcrypt, NULL, NULL); > mcrypt_module_entry.type = type; > #endif > @@ -329,8 +331,8 @@ > MCRYPT_ENTRY2_2_4(MODE_NOFB, "nofb"); > MCRYPT_ENTRY2_2_4(MODE_OFB, "ofb"); > MCRYPT_ENTRY2_2_4(MODE_STREAM, "stream"); > -#endif > REGISTER_INI_ENTRIES(); > +#endif > return SUCCESS; > } > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, e-mail: php-cvs-unsubscribe@lists.php.net > For additional commands, e-mail: php-cvs-help@lists.php.net > To contact the list administrators, e-mail: php-list-admin@lists.php.net -- Derick Rethans JDI Media Solutions H.v.Tussenbroekstraat 1 6952 BL Dieren The Netherlands e-mail: d.rethans@jdimedia.nl http://www.jdimedia.nl/