From: Zeev Suraski <zeev@php.net>
Date: Wed, 5 May 1999 21:47:04 +0000 (+0000)
Subject: vpath fix
X-Git-Tag: BEFORE_PHP4_APACHE_MODULE_CHANGE~93
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=842b5ee941c8c5c9f52c69d832f5110a54b554dc;p=php

vpath fix
Apache compatability fix
---

diff --git a/Makefile.in b/Makefile.in
index a4c1fe73d2..10af29153b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -89,7 +89,7 @@ php: all-recursive $(OBJS) @REGEX_LIB@ @FHTTPD_LIB@ @TSRM_LIB@
 # Apache modules
 libphp3.a libmodphp3.a: all-recursive $(OBJS)
 	$(AR) $@.tmp $(OBJS)
-	$(srcdir)/scripts/armerge $@ $@.tmp ext/libphpext.a libzend/libzend.a @TSRM_LIB@
+	$(srcdir)/scripts/armerge $@ $@.tmp ext/libphpext.a $(srcdir)/libzend/libzend.a @TSRM_LIB@
 	@rm -f $@.tmp
 	$(RANLIB) $(BINNAME)
 
diff --git a/main/SAPI.c b/main/SAPI.c
index a8077265e7..ede0176fac 100644
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -100,7 +100,7 @@ SAPI_API int sapi_add_header(const char *header_line, uint header_line_len)
 SAPI_API int sapi_send_headers()
 {
 	int retval;
-	sapi_header_struct default_header = { DEFAULT_CONTENT_TYPE, sizeof(DEFAULT_CONTENT_TYPE)-1 };
+	sapi_header_struct default_header = { SAPI_DEFAULT_CONTENT_TYPE, sizeof(SAPI_DEFAULT_CONTENT_TYPE)-1 };
 	SLS_FETCH();
 
 	if (SG(headers_sent)) {
diff --git a/main/SAPI.h b/main/SAPI.h
index 8d7aea61c3..6a1ff8a9af 100644
--- a/main/SAPI.h
+++ b/main/SAPI.h
@@ -105,6 +105,6 @@ struct _sapi_module_struct {
 #define SAPI_HEADER_DO_SEND				2
 #define SAPI_HEADER_SEND_FAILED			3
 
-#define DEFAULT_CONTENT_TYPE "Content-Type: text/html"
+#define SAPI_DEFAULT_CONTENT_TYPE "Content-Type: text/html"
 
 #endif /* _NEW_SAPI_H */
\ No newline at end of file