Update of /cvsroot/monetdb/MonetDB/src/gdk
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11297
Modified Files:
Tag: MonetDB_1-20
gdk_posix.mx
Log Message:
The "int" parameters of CreateFile and CreateFileMapping are actually
DWORD (unsigned long) (not that this matters much on Windows).
Index: gdk_posix.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/gdk/gdk_posix.mx,v
retrieving revision 1.143.2.6
retrieving revision 1.143.2.7
diff -u -d -r1.143.2.6 -r1.143.2.7
--- gdk_posix.mx 19 Dec 2007 04:43:38 -0000 1.143.2.6
+++ gdk_posix.mx 19 Dec 2007 12:56:52 -0000 1.143.2.7
@@ -1253,10 +1253,10 @@
MT_mmap_open(MT_mmap_hdl *hdl, char *path, int mode, off_t off, size_t len,
size_t nremaps)
{
void *ret = NULL;
- int mode0 = FILE_READ_ATTRIBUTES | FILE_READ_DATA;
- int mode1 = FILE_SHARE_READ;
- int mode2 = mode & MMAP_ADVISE;
- int mode3 = PAGE_READONLY;
+ DWORD mode0 = FILE_READ_ATTRIBUTES | FILE_READ_DATA;
+ DWORD mode1 = FILE_SHARE_READ;
+ DWORD mode2 = mode & MMAP_ADVISE;
+ DWORD mode3 = PAGE_READONLY;
int mode4 = FILE_MAP_READ;
SECURITY_ATTRIBUTES sa;
HANDLE h1, h2;
@@ -1290,13 +1290,13 @@
h1 = CreateFile(path, mode0, mode1, &sa, OPEN_ALWAYS, mode2, NULL);
if (h1 == INVALID_HANDLE_VALUE) {
- GDKsyserror("MT_mmap: CreateFile('%s', %d, %d, &sa, %d, %d,
NULL) failed\n", path, mode0, mode1, OPEN_ALWAYS, mode2);
+ GDKsyserror("MT_mmap: CreateFile('%s', %lu, %lu, &sa, %lu, %lu,
NULL) failed\n", path, mode0, mode1, (DWORD) OPEN_ALWAYS, mode2);
return (void *) -1;
}
h2 = CreateFileMapping(h1, &sa, mode3, (DWORD) ((((gdk_int64) off +
(gdk_int64) len) >> 32) & LL_CONSTANT(0xFFFFFFFF)), (DWORD) ((off + len) &
LL_CONSTANT(0xFFFFFFFF)), NULL);
if (h2 == NULL) {
- GDKsyserror("MT_mmap: CreateFileMapping(" PTRFMT ", &sa, %d,
%d, %u, NULL) failed\n", PTRFMTCAST h1, mode3, (DWORD) ((((gdk_int64) off +
(gdk_int64) len) >> 32) & LL_CONSTANT(0xFFFFFFFF)), (DWORD) ((off + len) &
LL_CONSTANT(0xFFFFFFFF)));
+ GDKsyserror("MT_mmap: CreateFileMapping(" PTRFMT ", &sa, %lu,
%lu, %lu, NULL) failed\n", PTRFMTCAST h1, mode3, (DWORD) ((((gdk_int64) off +
(gdk_int64) len) >> 32) & LL_CONSTANT(0xFFFFFFFF)), (DWORD) ((off + len) &
LL_CONSTANT(0xFFFFFFFF)));
CloseHandle(h1);
return (void *) -1;
}
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
