Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/php-5_3/imap/patches/03_imap_os_soln.h.patch
author Craig Mohrman <craig.mohrman@oracle.com>
Thu, 31 May 2012 14:36:45 -0700
changeset 846 fe258446a1ae
permissions -rw-r--r--
6714149 integrate PHP 5.3 within OpenSolaris
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
846
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     1
 
--- imap-2007f/src/osdep/unix/os_soln.h_orig	Fri Jul 22 17:20:10 2011
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     2
 
+++ imap-2007f/src/osdep/unix/os_soln.h	Mon Nov  7 14:21:29 2011
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     3
 
@@ -37,7 +37,11 @@
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     4
 
 #include <utime.h>
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     5
 
 #include <syslog.h>
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     6
 
 #include <sys/file.h>
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     7
 
+#if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     8
 
+#define NOUSTAT 1
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     9
 
+#else
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
    10
 
 #include <ustat.h>
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
    11
 
+#endif
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
    12
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
    13
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
    14
 
 /* Many versions of SysV get this wrong */
upstream/oracle/userland-gate