Changeset: 90c2ff992a1a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=90c2ff992a1a
Modified Files:
        gdk/gdk_posix.c
Branch: leftmart
Log Message:

Merge with default branch.


diffs (21 lines):

diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -397,7 +397,7 @@ MT_mremap(const char *path, int mode, vo
                if (munmap((char *) old_address + *new_size,
                           old_size - *new_size) < 0) {
                        GDKsyserror("MT_mremap: munmap("PTRFMT","SZFMT") 
failed\n",
-                                   PTRFMTCAST (char *) old_address + *new_size,
+                                   PTRFMTCAST ((char *) old_address + 
*new_size),
                                    old_size - *new_size);
                        fprintf(stderr, "= %s:%d: 
MT_mremap(%s,"PTRFMT","SZFMT","SZFMT"): munmap() failed\n", __FILE__, __LINE__, 
path?path:"NULL", PTRFMTCAST old_address, old_size, *new_size);
                        return NULL;
@@ -544,7 +544,7 @@ MT_mremap(const char *path, int mode, vo
                                        fd = open(p, O_RDWR | O_CREAT,
                                                  MONETDB_MODE);
                                        if (fd < 0) {
-                                               GDKsyserror("MT_mremap: 
open(%s) failed\n", p);
+                                               GDKsyserror("MT_mremap: 
open(%s) failed\n", (char *) p);
                                                free(p);
                                                fprintf(stderr, "= %s:%d: 
MT_mremap(%s,"PTRFMT","SZFMT","SZFMT"): fd < 0\n", __FILE__, __LINE__, path, 
PTRFMTCAST old_address, old_size, *new_size);
                                                return NULL;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to