From: Wez Furlong <wez@php.net>
Date: Sun, 17 Nov 2002 19:28:57 +0000 (+0000)
Subject: s/off64t/off64_t/
X-Git-Tag: php-4.3.0RC2~111
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b717a898b410eb6b34f4f8f7d32dec304890018;p=php

s/off64t/off64_t/
---

diff --git a/acinclude.m4 b/acinclude.m4
index 457e2970cf..d7af5fffdf 100644
--- 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 cc097fab79..c8f2b7f069 100755
--- 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();