Patch 60092.patch for Compile Failure Bug #60092

Patch version 2011-10-20 11:48 UTC

• 2011-10-20 11:48 UTC [diff to current]

Developer: jojo@hp.com

/usr/local/bin/diff -EBbu ./ext/phar/func_interceptors.c.orig ./ext/phar/func_interceptors.c
--- ./ext/phar/func_interceptors.c.orig	2010-12-31 20:48:19.000000000 -0600
+++ ./ext/phar/func_interceptors.c	2011-10-19 05:00:41.000000000 -0500
@@ -791,10 +791,14 @@
 			if (data) {
 				sb.st_ino = data->inode;
 			}
-#ifndef PHP_WIN32
+#ifndef PHP_WIN32 /* ?? */
+#ifdef HAVE_ST_BLKSIZE
 			sb.st_blksize = -1;
+#endif
+#ifdef HAVE_ST_BLOCKS
 			sb.st_blocks = -1;
 #endif
+#endif
 			phar_fancy_stat(&sb, type, return_value TSRMLS_CC);
 			return;
 		}
/usr/local/bin/diff -EBbu ./ext/phar/stream.c.orig ./ext/phar/stream.c
--- ./ext/phar/stream.c.orig	2011-08-07 06:13:27.000000000 -0500
+++ ./ext/phar/stream.c	2011-10-19 05:02:08.000000000 -0500
@@ -544,10 +544,14 @@
 	if (!is_temp_dir) {
 		ssb->sb.st_ino = data->inode;
 	}
-#ifndef PHP_WIN32
+#ifndef PHP_WIN32 /* ?? */
+#ifdef HAVE_ST_BLKSIZE
 	ssb->sb.st_blksize = -1;
+#endif
+#ifdef HAVE_ST_BLOCKS
 	ssb->sb.st_blocks = -1;
 #endif
+#endif
 }
 /* }}}*/
 
/usr/local/bin/diff -EBbu ./ext/sqlite3/libsqlite/sqlite3.c.orig ./ext/sqlite3/libsqlite/sqlite3.c
--- ./ext/sqlite3/libsqlite/sqlite3.c.orig	2011-10-17 13:44:13.000000000 -0500
+++ ./ext/sqlite3/libsqlite/sqlite3.c	2011-10-20 04:51:47.000000000 -0500
@@ -27876,7 +27888,11 @@
       ** is the same technique used by glibc to implement posix_fallocate()
       ** on systems that do not have a real fallocate() system call.
       */
+#ifdef HAVE_ST_BLKSIZE
       int nBlk = buf.st_blksize;  /* File-system block size */
+#else
+      int nBlk = 4096;  /* File-system block size */
+#endif
       i64 iWrite;                 /* Next offset to write to */
 
       if( robust_ftruncate(pFile->h, nSize) ){
/usr/local/bin/diff -EBbu ./main/streams/memory.c.orig ./main/streams/memory.c
--- ./main/streams/memory.c.orig	2010-12-31 20:19:59.000000000 -0600
+++ ./main/streams/memory.c	2011-10-19 05:08:36.000000000 -0500
@@ -232,13 +232,17 @@
 	/* generate unique inode number for alias/filename, so no phars will conflict */
 	ssb->sb.st_ino = 0;
 
-#ifndef PHP_WIN32
+#ifndef PHP_WIN32 /* ?? */
+#ifdef HAVE_ST_BLKSIZE
 	ssb->sb.st_blksize = -1;
 #endif
+#endif
 
-#if !defined(PHP_WIN32) && !defined(__BEOS__)
+#if !defined(PHP_WIN32) && !defined(__BEOS__) /* ?? */
+#ifdef HAVE_ST_BLOCKS
 	ssb->sb.st_blocks = -1;
 #endif
+#endif
 
 	return 0;
 }