---------------------
PatchSet 1099 
Date: 2004/11/01 10:22:10
Author: serassio
Branch: nt
Tag: (none) 
Log:
Fixed different 64 bit integer constant definition syntax between gcc and MS Visual C

Members: 
	port/win32/src/aio.cc:1.1.6.2->1.1.6.3 

Index: squid3/port/win32/src/aio.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/port/win32/src/Attic/aio.cc,v
retrieving revision 1.1.6.2
retrieving revision 1.1.6.3
diff -u -r1.1.6.2 -r1.1.6.3
--- squid3/port/win32/src/aio.cc	28 Aug 2003 17:33:12 -0000	1.1.6.2
+++ squid3/port/win32/src/aio.cc	1 Nov 2004 10:22:10 -0000	1.1.6.3
@@ -1,6 +1,6 @@
 
 /*
- * $Id: aio.cc,v 1.1.6.2 2003/08/28 17:33:12 serassio Exp $
+ * $Id: aio.cc,v 1.1.6.3 2004/11/01 10:22:10 serassio Exp $
  *
  * DEBUG: section 81    aio_xxx() POSIX emulation on WIN32 for COSS
  * AUTHOR: Guido Serassio
@@ -62,8 +62,13 @@
     } 
 
 #if _FILE_OFFSET_BITS==64
+#ifdef __GNUC__
+    Overlapped->Offset = (DWORD) (aiocbp->aio_offset % 0x100000000LL);
+    Overlapped->OffsetHigh = (DWORD) (aiocbp->aio_offset / 0x100000000LL);
+#else
     Overlapped->Offset = (DWORD) (aiocbp->aio_offset % 0x100000000);
     Overlapped->OffsetHigh = (DWORD) (aiocbp->aio_offset / 0x100000000);
+#endif 
 #else
     Overlapped->Offset = aiocbp->aio_offset; 
     Overlapped->OffsetHigh = 0;
@@ -104,8 +109,13 @@
         return -1; 
     } 
 
-    Overlapped->Offset = (DWORD) (aiocbp->aio_offset % 0x100000000);
-    Overlapped->OffsetHigh = (DWORD) (aiocbp->aio_offset / 0x100000000);
+#ifdef __GNUC__
+    Overlapped->Offset = (DWORD) (aiocbp->aio_offset % 0x100000000LL);
+    Overlapped->OffsetHigh = (DWORD) (aiocbp->aio_offset / 0x100000000LL);
+#else
+    Overlapped->Offset = (DWORD) (aiocbp->aio_offset % 0x100000000LL);
+    Overlapped->OffsetHigh = (DWORD) (aiocbp->aio_offset / 0x100000000LL);
+#endif
     Overlapped->hEvent = aiocbp;
     aiocbp->aio_sigevent.sigev_notify = EINPROGRESS;
     aiocbp->aio_sigevent.sigev_signo = -1;
@@ -143,8 +153,13 @@
         return -1; 
     } 
 #if _FILE_OFFSET_BITS==64
+#ifdef __GNUC__
+    Overlapped->Offset = (DWORD) (aiocbp->aio_offset % 0x100000000LL);
+    Overlapped->OffsetHigh = (DWORD) (aiocbp->aio_offset / 0x100000000LL);
+#else
     Overlapped->Offset = (DWORD) (aiocbp->aio_offset % 0x100000000);
     Overlapped->OffsetHigh = (DWORD) (aiocbp->aio_offset / 0x100000000);
+#endif
 #else
     Overlapped->Offset = aiocbp->aio_offset; 
     Overlapped->OffsetHigh = 0;
@@ -185,8 +200,13 @@
 	errno = ENOMEM; 
         return -1; 
     } 
+#ifdef __GNUC__
+    Overlapped->Offset = (DWORD) (aiocbp->aio_offset % 0x100000000LL);
+    Overlapped->OffsetHigh = (DWORD) (aiocbp->aio_offset / 0x100000000LL);
+#else
     Overlapped->Offset = (DWORD) (aiocbp->aio_offset % 0x100000000);
     Overlapped->OffsetHigh = (DWORD) (aiocbp->aio_offset / 0x100000000);
+#endif
     Overlapped->hEvent = aiocbp;
     aiocbp->aio_sigevent.sigev_notify = EINPROGRESS;
     aiocbp->aio_sigevent.sigev_signo = -1;