[PHP-CVS] cvs: php4(PHP_4_3) / acinclude.m4 /main streams.c

[Wez Furlong]

wez             Sun Nov 17 14:28:57 2002 EDT

  Modified files:              (Branch: PHP_4_3)
    /php4/main  streams.c 
    /php4       acinclude.m4 
  Log:
  s/off64t/off64_t/
  
  
Index: php4/main/streams.c
diff -u php4/main/streams.c:1.125.2.11 php4/main/streams.c:1.125.2.12
--- php4/main/streams.c:1.125.2.11      Sun Nov 17 14:14:49 2002
+++ php4/main/streams.c Sun Nov 17 14:28:57 2002
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: streams.c,v 1.125.2.11 2002/11/17 19:14:49 wez Exp $ */
+/* $Id: streams.c,v 1.125.2.12 2002/11/17 19:28:57 wez Exp $ */
 
 #define _GNU_SOURCE
 #include "php.h"
@@ -1756,8 +1756,8 @@
        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();
 
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.218.2.1 php4/acinclude.m4:1.218.2.2
--- php4/acinclude.m4:1.218.2.1 Sun Nov 17 14:14:49 2002
+++ php4/acinclude.m4   Sun Nov 17 14:28:57 2002
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.218.2.1 2002/11/17 19:14:49 wez Exp $
+dnl $Id: acinclude.m4,v 1.218.2.2 2002/11/17 19:28:57 wez Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -1487,7 +1487,7 @@
 #include <stdio.h>
 
 struct cookiedata {
-       __off64t pos;
+       __off64_t pos;
 };
 
 __ssize_t reader(void *cookie, char *buffer, size_t size)
@@ -1496,7 +1496,7 @@
 { 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 @@
 }
 
                                           ],
-                                          [ cookie_io_functions_use_off64t=yes ],
+                                          [ cookie_io_functions_use_off64_t=yes ],
                                           [ ] )
                
       else
@@ -1532,8 +1532,8 @@
       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      
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php