zeev Mon Feb 5 13:59:17 2001 EDT
Modified files:
/php4/ext/com typedef_VARIANT.c
/php4/ext/standard basic_functions.c
Log:
Fix Windows build
Index: php4/ext/com/typedef_VARIANT.c
diff -u php4/ext/com/typedef_VARIANT.c:1.4 php4/ext/com/typedef_VARIANT.c:1.5
--- php4/ext/com/typedef_VARIANT.c:1.4 Fri Feb 2 07:01:48 2001
+++ php4/ext/com/typedef_VARIANT.c Mon Feb 5 13:59:16 2001
@@ -30,6 +30,7 @@
#include "php_ini.h"
#include "php_typedef_VARIANT.h"
#include "conversion.h"
+#include "ext/standard/info.h"
#include <unknwn.h>
@@ -48,6 +49,7 @@
{NULL, NULL, NULL}
};
+
static PHP_MINFO_FUNCTION(VARIANT)
{
php_info_print_table_start();
@@ -55,9 +57,11 @@
php_info_print_table_end();
}
+
zend_module_entry VARIANT_module_entry = {
"variant", VARIANT_functions, PHP_MINIT(VARIANT), PHP_MSHUTDOWN(VARIANT),
NULL, NULL, PHP_MINFO(VARIANT), STANDARD_MODULE_PROPERTIES
};
+
PHP_MINIT_FUNCTION(VARIANT)
{
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.301
php4/ext/standard/basic_functions.c:1.302
--- php4/ext/standard/basic_functions.c:1.301 Mon Feb 5 09:37:47 2001
+++ php4/ext/standard/basic_functions.c Mon Feb 5 13:59:16 2001
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.301 2001/02/05 17:37:47 andrei Exp $ */
+/* $Id: basic_functions.c,v 1.302 2001/02/05 21:59:16 zeev Exp $ */
#include "php.h"
#include "php_main.h"
@@ -1530,39 +1530,39 @@
}
/* }}} */
-PHPAPI int _php_error_log(int opt_err,char *message,char *opt,char *headers){
+PHPAPI int _php_error_log(int opt_err,char *message,char *opt,char *headers)
+{
FILE *logfile;
int issock=0, socketd=0;;
switch(opt_err){
- case 1: /*send an email*/
- {
+ case 1: /*send an email*/ {
#if HAVE_SENDMAIL
- if (!php_mail(opt,"PHP error_log message",message,headers)){
- return FAILURE;
- }
+ if (!php_mail(opt, "PHP error_log message", message,
+headers, NULL)){
+ return FAILURE;
+ }
#else
- php_error(E_WARNING,"Mail option not available!");
- return FAILURE;
+ php_error(E_WARNING,"Mail option not available!");
+ return FAILURE;
#endif
- }
- break;
- case 2: /*send to an address */
- php_error(E_WARNING,"TCP/IP option not available!");
- return FAILURE;
- break;
- case 3: /*save to a file*/
- logfile=php_fopen_wrapper(opt,"a", (IGNORE_URL|ENFORCE_SAFE_MODE),
&issock, &socketd, NULL);
- if(!logfile) {
- php_error(E_WARNING,"error_log: Unable to write to %s",opt);
+ }
+ break;
+ case 2: /*send to an address */
+ php_error(E_WARNING,"TCP/IP option not available!");
return FAILURE;
- }
- fwrite(message,strlen(message),1,logfile);
- fclose(logfile);
- break;
- default:
- php_log_err(message);
- break;
+ break;
+ case 3: /*save to a file*/
+ logfile=php_fopen_wrapper(opt,"a",
+(IGNORE_URL|ENFORCE_SAFE_MODE), &issock, &socketd, NULL);
+ if(!logfile) {
+ php_error(E_WARNING,"error_log: Unable to write to
+%s",opt);
+ return FAILURE;
+ }
+ fwrite(message,strlen(message),1,logfile);
+ fclose(logfile);
+ break;
+ default:
+ php_log_err(message);
+ break;
}
return SUCCESS;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
