diff options
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/bsp/test/Makefile | 2 | ||||
| -rw-r--r-- | intern/guardedalloc/intern/mallocn.c | 12 | ||||
| -rw-r--r-- | intern/iksolver/test/Makefile | 2 |
3 files changed, 3 insertions, 13 deletions
diff --git a/intern/bsp/test/Makefile b/intern/bsp/test/Makefile index eebf7470a0f..91e4497b267 100644 --- a/intern/bsp/test/Makefile +++ b/intern/bsp/test/Makefile @@ -47,7 +47,7 @@ SLIBS += $(NAN_MOTO)/lib/$(DEBUG_DIR)libmoto.a SLIBS += $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a SLIBS += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a -ifeq ($(OS),$(findstring $(OS), "beos darwin linux freebsd openbsd")) +ifeq ($(OS),$(findstring $(OS), "darwin linux freebsd openbsd")) LLIBS = -L/usr/X11R6/lib -lglut -pthread -lXi -lXmu endif diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index 7bdca7339fc..3b5f6a0caf9 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -38,8 +38,7 @@ #include <stdarg.h> /* mmap exception */ -#if defined(AMIGA) || defined(__BeOS) -#elif defined(WIN32) +#if defined(WIN32) #include <sys/types.h> #include "mmap_win.h" #else @@ -292,9 +291,6 @@ void *MEM_callocN(unsigned int len, const char *str) /* note; mmap returns zero'd memory */ void *MEM_mapallocN(unsigned int len, const char *str) { -#if defined(AMIGA) || defined(__BeOS) - return MEM_callocN(len, str); -#else MemHead *memh; mem_lock_thread(); @@ -329,7 +325,6 @@ void *MEM_mapallocN(unsigned int len, const char *str) print_error("Mapalloc returns nill, fallback to regular malloc: len=%d in %s, total %u\n",len, str, mmap_in_use); return MEM_callocN(len, str); } -#endif } /* Memory statistics print */ @@ -589,10 +584,6 @@ static void rem_memblock(MemHead *memh) totblock--; mem_in_use -= memh->len; -#if defined(AMIGA) || defined(__BeOS) - free(memh); -#else - if(memh->mmap) { mmap_in_use -= memh->len; if (munmap(memh, memh->len + sizeof(MemHead) + sizeof(MemTail))) @@ -603,7 +594,6 @@ static void rem_memblock(MemHead *memh) memset(memh+1, 255, memh->len); free(memh); } -#endif } static void MemorY_ErroR(const char *block, const char *error) diff --git a/intern/iksolver/test/Makefile b/intern/iksolver/test/Makefile index 4ab317f9e9f..ed867ba2a73 100644 --- a/intern/iksolver/test/Makefile +++ b/intern/iksolver/test/Makefile @@ -46,7 +46,7 @@ LIBS += $(OCGDIR)/intern/$(LIBNAME)/$(DEBUG_DIR)libiksolver.a SLIBS += $(NAN_MOTO)/lib/$(DEBUG_DIR)libmoto.a -ifeq ($(OS),$(findstring $(OS), "beos darwin linux freebsd openbsd")) +ifeq ($(OS),$(findstring $(OS), "darwin linux freebsd openbsd")) LLIBS = -L/usr/X11R6/lib -lglut -pthread endif |