mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 19:05:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

More work on php3_ annihilation...

Browse Source
This commit is contained in:
Zeev Suraski 1999-12-17 20:55:32 +00:00
parent fb1c77bd4f
commit 2d0b84ee30
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ext/standard/basic_functions.c
View File

@ -50,14 +50,6 @@
#include "php_globals.h"
#include "SAPI.h"
#if APACHE
/*
ap_compat.h does a
#define md5 ap_md5
which "kills" out md5 function.
*/
#undef md5
#endif
#ifdef ZTS
int basic_globals_id;
@ -114,7 +106,7 @@ function_entry basic_functions[] = {
PHP_FE(htmlentities, NULL)
PHP_FE(get_html_translation_table, NULL)
PHP_FE(md5, NULL)
PHP_NAMED_FE(md5, php_if_md5, NULL)
PHP_FE(iptcparse, NULL)
PHP_FE(iptcembed, NULL)

2
ext/standard/md5.c
View File

@ -27,7 +27,7 @@
/* {{{ proto string md5(string str)
Calculate the md5 hash of a string */
PHP_FUNCTION(md5)
PHP_NAMED_FUNCTION(php_if_md5)
{
pval **arg;
char md5str[33];

2
ext/standard/md5.h
View File

@ -66,6 +66,6 @@ void PHP3_MD5Init PROTO_LIST((PHP3_MD5_CTX *));
void PHP3_MD5Update PROTO_LIST((PHP3_MD5_CTX *, const unsigned char *, unsigned int));
void PHP3_MD5Final PROTO_LIST((unsigned char[16], PHP3_MD5_CTX *));
PHP_FUNCTION(md5);
PHP_NAMED_FUNCTION(php_if_md5);
#endif