summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>1999-04-18 20:59:54 +0000
committerZeev Suraski <zeev@php.net>1999-04-18 20:59:54 +0000
commit1390eadc143c1c693acef777d3ecb8ce5982978c (patch)
tree777061a97bb9808125d7d5453f91fbee7ecb1d4a
parent1ae9891e7ecde83360af6ac90babc25ba38a76a7 (diff)
downloadphp-git-1390eadc143c1c693acef777d3ecb8ce5982978c.tar.gz
Ah, so that file is generated too
-rw-r--r--ext/Makefile.am2
-rw-r--r--main/main.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 06dc78ffc4..56ba636b8a 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -5,4 +5,4 @@ SUBDIRS = @EXT_SUBDIRS@
noinst_LIBRARIES=libphpext.a
libphpext.a: @EXT_LIBS@
- $(top_srcdir)/scripts/mkextlib $@ $(SUBDIRS)
+ top_srcdir=$(top_srcdir) $(top_builddir)/scripts/mkextlib $@ $(SUBDIRS)
diff --git a/main/main.c b/main/main.c
index b20f85aca9..5c5ed82453 100644
--- a/main/main.c
+++ b/main/main.c
@@ -610,7 +610,7 @@ static void php_message_handler_for_zend(long message, void *data)
# if APACHE /* log into the errorlog, since at this time we can't send messages to the browser */
char memory_leak_buf[512];
- snprintf(memory_leak_buf,512,"Possible PHP4 memory leak detected (harmless): %d bytes from %s:%d",t->size,t->filename,t->lineno);
+ snprintf(memory_leak_buf,512,"Possible PHP4 memory leak detected (harmless): 0x%0.8lX, %d bytes from %s:%d", (long) t, t->size, t->filename, t->lineno);
# if MODULE_MAGIC_NUMBER >= 19970831
aplog_error(NULL, 0, APLOG_ERR | APLOG_NOERRNO, GLOBAL(php3_rqst)->server, memory_leak_buf);
# else