MonetDB: default - gdk_int64 is gone: use __int64.

[Sjoerd Mullender]

Changeset: 22b58c152e8b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=22b58c152e8b
Modified Files:
        gdk/gdk_posix.mx
Branch: default
Log Message:

gdk_int64 is gone: use __int64.


diffs (26 lines):

diff --git a/gdk/gdk_posix.mx b/gdk/gdk_posix.mx
--- a/gdk/gdk_posix.mx
+++ b/gdk/gdk_posix.mx
@@ -1366,11 +1366,11 @@
                }
        }
 
-       h2 = CreateFileMapping(h1, &sa, mode3, (DWORD) ((((gdk_int64) off + 
(gdk_int64) len) >> 32) & LL_CONSTANT(0xFFFFFFFF)), (DWORD) ((off + len) & 
LL_CONSTANT(0xFFFFFFFF)), NULL);
+       h2 = CreateFileMapping(h1, &sa, mode3, (DWORD) ((((__int64) off + 
(__int64) len) >> 32) & LL_CONSTANT(0xFFFFFFFF)), (DWORD) ((off + len) & 
LL_CONSTANT(0xFFFFFFFF)), NULL);
        if (h2 == NULL) {
                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) ((((__int64) off + (__int64) len) >> 32) & 
LL_CONSTANT(0xFFFFFFFF)),
                            (DWORD) ((off + len) & LL_CONSTANT(0xFFFFFFFF)));
                CloseHandle(h1);
                return (void *) -1;
@@ -1419,7 +1419,7 @@
        remap_t *map = (remap_t *) hdl->map;
        void *ret;
 
-       ret = MapViewOfFileEx((HANDLE) hdl->hdl, hdl->mode, (DWORD) 
((gdk_int64) off >> 32), (DWORD) off, len, (void *) ((char *) hdl->fixed));
+       ret = MapViewOfFileEx((HANDLE) hdl->hdl, hdl->mode, (DWORD) ((__int64) 
off >> 32), (DWORD) off, len, (void *) ((char *) hdl->fixed));
        if (ret == NULL) {
                return (void *) -1;
        }
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list