diff options
| author | Ian Thompson <quornian@googlemail.com> | 2008-06-09 18:04:19 +0400 |
|---|---|---|
| committer | Ian Thompson <quornian@googlemail.com> | 2008-06-09 18:04:19 +0400 |
| commit | 10d59e720827660ab73801165c3c0925a27c5101 (patch) | |
| tree | 36e45ee082b1abdcfcb64906a604fcda9119060d /intern | |
| parent | 7fd8c2424f339dfad88745e7d39b3ddcb8b484fc (diff) | |
Merged from trunk
svn merge -r14988:15170 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/bsp/SConscript | 2 | ||||
| -rw-r--r-- | intern/guardedalloc/intern/mmap_win.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/intern/bsp/SConscript b/intern/bsp/SConscript index e363fd1d4c3..88d2529ae59 100644 --- a/intern/bsp/SConscript +++ b/intern/bsp/SConscript @@ -8,5 +8,5 @@ incs = 'intern ../container ../moto/include ../memutil' if (env['OURPLATFORM'] == 'win32-mingw'): env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype=['common','intern'], priority=[26,26] ) else: - env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype='core', priority=15 ) + env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype='core', priority=26 ) diff --git a/intern/guardedalloc/intern/mmap_win.c b/intern/guardedalloc/intern/mmap_win.c index cc31cf5174e..436c99344a7 100644 --- a/intern/guardedalloc/intern/mmap_win.c +++ b/intern/guardedalloc/intern/mmap_win.c @@ -200,7 +200,6 @@ static void mmap_remlink(volatile mmapListBase *listbase, void *vlink) static void *mmap_findlink(volatile mmapListBase *listbase, void *ptr) { - MemMap *mmap_ptr = (MemMap*)ptr; MemMap *mm; if (ptr == 0) return NULL; |