SAPIfication, Episode VI: Return of the SAPI

Remove mostly all references to APACHE and CGI_BINARY from the code.

- Apache include files are no longer included by any PHP code, except for the Apache SAPI module.
- No server specific code is in any of the base PHP code.

Still left to be done:
- Eliminate any references to APACHE from the few remaining modules.
- Move request_info.c's logic to SAPI
- Modify the regex function names, and globals, so that we can always
  include them, without having to fear any interference with Apache;
  Always use the bundled regex library

1 files changed, 7 insertions, 7 deletions

diff --git a/main/snprintf.h b/main/snprintf.h
index 7c9afdbff8..e9a10e4e79 100644
--- a/main/snprintf.h
+++ b/main/snprintf.h
@@ -16,17 +16,17 @@
    +----------------------------------------------------------------------+
  */
 
-#ifndef _PHP3_SNPRINTF_H
-#define _PHP3_SNPRINTF_H
+#ifndef _PHP_SNPRINTF_H
+#define _PHP_SNPRINTF_H
 
 #ifndef HAVE_SNPRINTF
-extern int ap_snprintf(char *, size_t, const char *, ...);
-#define snprintf ap_snprintf
+extern int ap_php_snprintf(char *, size_t, const char *, ...);
+#define snprintf ap_php_snprintf
 #endif
 
 #ifndef HAVE_VSNPRINTF
-extern int ap_vsnprintf(char *, size_t, const char *, va_list ap);
-#define vsnprintf ap_vsnprintf
+extern int ap_php_vsnprintf(char *, size_t, const char *, va_list ap);
+#define vsnprintf ap_php_vsnprintf
 #endif
 
 #if BROKEN_SPRINTF
@@ -35,7 +35,7 @@ int php_sprintf (char* s, const char* format, ...);
 #define php_sprintf sprintf
 #endif
 
-#endif /* _PHP3_SNPRINTF_H */
+#endif /* _PHP_SNPRINTF_H */
 
 /*
  * Local variables: