Ver código fonte

2008-06-16 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	Applied Ross's aria2-0.13.2+1-mingw-4.patch. In this change,
	a2io.h and common.h were modified.
	* src/a2io.h: Changed seek/stat/tell calls to use 64 bit 
versions in
	MinGW.
	* src/common.h: Changed off_t to 64 bit in MinGW.
Tatsuhiro Tsujikawa 17 anos atrás
pai
commit
2c02415f97
3 arquivos alterados com 26 adições e 2 exclusões
  1. 8 0
      ChangeLog
  2. 11 2
      src/a2io.h
  3. 7 0
      src/common.h

+ 8 - 0
ChangeLog

@@ -1,3 +1,11 @@
+2008-06-16  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+
+	Applied Ross's aria2-0.13.2+1-mingw-4.patch. In this change,
+	a2io.h and common.h were modified.
+	* src/a2io.h: Changed seek/stat/tell calls to use 64 bit versions in
+	MinGW.
+	* src/common.h: Changed off_t to 64 bit in MinGW.
+
 2008-06-16  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	Applied Ross's aria2-0.13.2+1-mingw-4.patch. In this commit,

+ 11 - 2
src/a2io.h

@@ -95,7 +95,7 @@
 # define	S_IRWXO		(S_IROTH | S_IWOTH | S_IXOTH)
 #endif /* S_IRWXO		*/
 
-// Use 'null' instead of /dev/null in win32.
+// Use 'nul' instead of /dev/null in win32.
 #ifdef HAVE_WINSOCK2_H
 # define DEV_NULL "nul"
 #else
@@ -110,7 +110,16 @@
 #endif // HAVE_WINSOCK2_H
 
 #ifdef __MINGW32__
-# define lseek(a, b, c) _lseeki64((a), (b), (c))
+# define lseek(fd, offset, origin) _lseeki64(fd, offset, origin)
+# define fseek(fd, offset, origin) _fseeki64(fd, offset, origin)
+# define fstat(fd, buf) _fstati64(fd, buf)
+# define ftell(fd) _ftelli64(fd)
+# define wstat(path, buf) _wstati64(path, buf)
+# ifdef stat
+#  undef stat
+# endif // stat
+# define stat(path, buf)  _stati64(path, buf)
+# define tell(handle) _telli64(handle)
 # define a2mkdir(path, openMode) mkdir(path)
 #else
 # define a2mkdir(path, openMode) mkdir(path, openMode)

+ 7 - 0
src/common.h

@@ -37,6 +37,13 @@
 
 #ifdef __MINGW32__
 # undef SIZE_MAX
+# ifndef _OFF_T_
+#  define _OFF_T_
+   typedef long long _off_t;
+#  ifndef _NO_OLDNAMES
+   typedef _off_t off_t;
+#  endif // !_NO_OLDNAMES
+# endif	// !_OFF_T_
 #endif // __MINGW32__
 
 #ifdef HAVE_CONFIG_H