cvs: /php4/ext/cpdf cpdf.c /php4/sapi/apache mod_php4.c

andrei Tue Dec 21 15:02:56 1999 EDT Modified files: /php4/ext/cpdf cpdf.c /php4/sapi/apache mod_php4.c Log: Some more php3->php stuff. Index: php4/ext/cpdf/cpdf.c diff -u php4/ext/cpdf/cpdf.c:1.6 php4/ext/cpdf/cpdf.c:1.7 --- php4/ext/cpdf/cpdf.c:1.6 Fri Dec 17 15:54:47 1999 +++ php4/ext/cpdf/cpdf.c Tue Dec 21 15:02:25 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cpdf.c,v 1.6 1999/12/17 20:54:47 zeev Exp $ */ +/* $Id: cpdf.c,v 1.7 1999/12/21 20:02:25 andrei Exp $ */ /* cpdflib.h -- C language API definitions for ClibPDF library * Copyright (C) 1998 FastIO Systems, All Rights Reserved. */ @@ -377,7 +377,7 @@ convert_to_string(arg2); #if APACHE if(strcmp(arg2->value.str.val, "-") == 0) - php_error(E_WARNING,"Writing to stdout as described in the ClibPDF manual is not possible if php3 is used as an Apache module. Write to a memory stream and use cpdf_output_buffer() instead."); + php_error(E_WARNING,"Writing to stdout as described in the ClibPDF manual is not possible if php is used as an Apache module. Write to a memory stream and use cpdf_output_buffer() instead."); #endif cpdf_setOutputFilename(cpdf, arg2->value.str.val); } @@ -2225,7 +2225,7 @@ #if APACHE if(strcmp(arg2->value.str.val, "-") == 0) - php_error(E_WARNING,"Writing to stdout as described in the ClibPDF manual is not possible if php3 is used as an Apache module. Use cpdf_output_buffer() instead."); + php_error(E_WARNING,"Writing to stdout as described in the ClibPDF manual is not possible if php is used as an Apache module. Use cpdf_output_buffer() instead."); #endif cpdf_savePDFmemoryStreamToFile(pdf, arg2->value.str.val); Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.8 php4/sapi/apache/mod_php4.c:1.9 --- php4/sapi/apache/mod_php4.c:1.8 Mon Dec 20 18:09:50 1999 +++ php4/sapi/apache/mod_php4.c Tue Dec 21 15:02:26 1999 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.8 1999/12/20 23:09:50 sas Exp $ */ +/* $Id: mod_php4.c,v 1.9 1999/12/21 20:02:26 andrei Exp $ */ #include "zend.h" #include "php.h" @@ -110,7 +110,7 @@ # endif # define pclosef(p,f) close(f) #else -# define php3i_popenf(p,n,f,m) popenf((p),(n),(f),(m)) +# define php_popenf(p,n,f,m) popenf((p),(n),(f),(m)) #endif php_apache_info_struct php_apache_info; /* active config */