Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2013-09-01 09:12:36 +0400
committerJoshua Leung <aligorith@gmail.com>2013-09-01 09:12:36 +0400
commit33c68846de10c53c56eba3a6f5ce7f8d52ddb735 (patch)
tree50d98d7342669e965155f31df38be413e36d7dd4 /intern/guardedalloc
parent9d04a61f3652565cfe84d8e8b5192bd93177ce1d (diff)
Mingw/Windows Compiling Fix
This commit attempts to fix the following error: intern\guardedalloc\intern\mallocn.c: In function 'rem_memblock': intern\guardedalloc\intern\mallocn.c:977:48: error: conversion to 'intptr_t' from 'size_t' may change the sign of the result [-Werror=sign-conversion] From the references I've managed to find, it appears that the second arg to munmap() should be size_t not intptr_t. Fortunately though, we don't use this arg anyways atm, so this should be quite harmless...
Diffstat (limited to 'intern/guardedalloc')
-rw-r--r--intern/guardedalloc/intern/mmap_win.c2
-rw-r--r--intern/guardedalloc/mmap_win.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/guardedalloc/intern/mmap_win.c b/intern/guardedalloc/intern/mmap_win.c
index ab50edb811e..6f03188a579 100644
--- a/intern/guardedalloc/intern/mmap_win.c
+++ b/intern/guardedalloc/intern/mmap_win.c
@@ -159,7 +159,7 @@ void *mmap(void *UNUSED(start), size_t len, int prot, int flags, int fd, off_t o
}
/* munmap for windows */
-intptr_t munmap(void *ptr, intptr_t UNUSED(size))
+intptr_t munmap(void *ptr, size_t UNUSED(size))
{
MemMap *mm = mmap_findlink(mmapbase, ptr);
if (!mm) {
diff --git a/intern/guardedalloc/mmap_win.h b/intern/guardedalloc/mmap_win.h
index c84882b1052..0f88a8e3ba8 100644
--- a/intern/guardedalloc/mmap_win.h
+++ b/intern/guardedalloc/mmap_win.h
@@ -52,7 +52,7 @@
#include "../../source/blender/blenlib/BLI_sys_types.h"
void *mmap(void *start, size_t len, int prot, int flags, int fd, off_t offset);
-intptr_t munmap(void *ptr, intptr_t size);
+intptr_t munmap(void *ptr, size_t size);
#endif