Some more php3->php stuff.

ext/cpdf/cpdf.c

@@ -377,7 +377,7 @@ PHP_FUNCTION(cpdf_open) {
 		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 @@ PHP_FUNCTION(cpdf_save_to_file) {
 
 #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);

sapi/apache/mod_php4.c

@@ -110,7 +110,7 @@ typedef struct _php_per_dir_entry {
 # 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 */