helly Tue Oct 21 03:36:44 2003 EDT
Modified files:
/php-src configure.in
/php-src/main snprintf.c spprintf.c
Log:
Bugfix #25906 Sessions and Framesets
Index: php-src/configure.in
diff -u php-src/configure.in:1.470 php-src/configure.in:1.471
--- php-src/configure.in:1.470 Fri Oct 17 13:19:43 2003
+++ php-src/configure.in Tue Oct 21 03:36:42 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.470 2003/10/17 17:19:43 helly Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.471 2003/10/21 07:36:42 helly Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -368,7 +368,8 @@
utime.h \
sys/utsname.h \
sys/ipc.h \
-dlfcn.h
+dlfcn.h \
+inttypes.h
],[],[],[
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
@@ -1174,7 +1175,7 @@
zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \
- zend_iterators.c)
+ zend_iterators.c zend_interfaces.c)
if test -r "$abs_srcdir/Zend/zend_objects.c"; then
PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c
zend_mm.c \
Index: php-src/main/snprintf.c
diff -u php-src/main/snprintf.c:1.31 php-src/main/snprintf.c:1.32
--- php-src/main/snprintf.c:1.31 Mon Sep 29 19:44:07 2003
+++ php-src/main/snprintf.c Tue Oct 21 03:36:43 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: snprintf.c,v 1.31 2003/09/29 23:44:07 iliaa Exp $ */
+/* $Id: snprintf.c,v 1.32 2003/10/21 07:36:43 helly Exp $ */
/* ====================================================================
* Copyright (c) 1995-1998 The Apache Group. All rights reserved.
@@ -83,6 +83,9 @@
#include <string.h>
#include <stdlib.h>
#include <math.h>
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
#define FALSE 0
#define TRUE 1
Index: php-src/main/spprintf.c
diff -u php-src/main/spprintf.c:1.20 php-src/main/spprintf.c:1.21
--- php-src/main/spprintf.c:1.20 Sun Sep 28 21:07:55 2003
+++ php-src/main/spprintf.c Tue Oct 21 03:36:43 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spprintf.c,v 1.20 2003/09/29 01:07:55 iliaa Exp $ */
+/* $Id: spprintf.c,v 1.21 2003/10/21 07:36:43 helly Exp $ */
/* This is the spprintf implementation.
* It has emerged from apache snprintf. See original header:
@@ -87,6 +87,9 @@
#include <string.h>
#include <stdlib.h>
#include <math.h>
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
#include "snprintf.h"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
