s/off64t/off64_t/

diff --git a/acinclude.m4 b/acinclude.m4
index 457e2970cf49670ab0d30249a9d5b2dda23efc2c..d7af5fffdf5cbd333b2d8b61edde7e5e6fa605e2 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1487,7 +1487,7 @@ AC_DEFUN([PHP_FOPENCOOKIE],[
 #include <stdio.h>
 
 struct cookiedata {
-       __off64t pos;
+       __off64_t pos;
 };
 
 __ssize_t reader(void *cookie, char *buffer, size_t size)
@@ -1496,7 +1496,7 @@ __ssize_t writer(void *cookie, const char *buffer, size_t size)
 { return size; }
 int closer(void *cookie)
 { return 0; }
-int seeker(void *cookie, __off64t *position, int whence)
+int seeker(void *cookie, __off64_t *position, int whence)
 { ((struct cookiedata*)cookie)->pos = *position; return 0; }
 
 cookie_io_functions_t funcs = {reader, writer, seeker, closer};
@@ -1511,7 +1511,7 @@ main() {
 }
 
                                           ],
-                                          [ cookie_io_functions_use_off64t=yes ],
+                                          [ cookie_io_functions_use_off64_t=yes ],
                                           [ ] )
                
       else
@@ -1532,8 +1532,8 @@ main() {
       if test "$have_fopen_cookie" = "yes" ; then
         AC_DEFINE(HAVE_FOPENCOOKIE, 1, [ ])
         AC_DEFINE_UNQUOTED(COOKIE_IO_FUNCTIONS_T, $cookie_io_functions_t, [ ])
-               if test "$cookie_io_functions_use_off64t" = "yes" ; then
-          AC_DEFINE(COOKIE_SEEKER_USES_OFF64T, 1, [ ])
+               if test "$cookie_io_functions_use_off64_t" = "yes" ; then
+          AC_DEFINE(COOKIE_SEEKER_USES_OFF64_T, 1, [ ])
                fi
       fi      
 

diff --git a/main/streams.c b/main/streams.c
index cc097fab790112ffe23f4c0963fedab54bde26b5..c8f2b7f06956f62d37296eab1e0ca6c7045bc814 100755 (executable)
--- a/main/streams.c
+++ b/main/streams.c
@@ -1756,8 +1756,8 @@ static ssize_t stream_cookie_writer(void *cookie, const char *buffer, size_t siz
        return php_stream_write(((php_stream *)cookie), (char *)buffer, size);
 }
 
-#ifdef COOKIE_SEEKER_USES_OFF64T
-static int stream_cookie_seeker(void *cookie, __off64t *position, int whence)
+#ifdef COOKIE_SEEKER_USES_OFF64_T
+static int stream_cookie_seeker(void *cookie, __off64_t *position, int whence)
 {
        TSRMLS_FETCH();