vpath fix

Apache compatability fix
This commit is contained in:
Zeev Suraski 1999-05-05 21:47:04 +00:00
parent 6f1c611868
commit 842b5ee941
3 changed files with 3 additions and 3 deletions

View File

@ -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)

View File

@ -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)) {

View File

@ -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 */