diff options
| -rw-r--r-- | intern/guardedalloc/intern/mallocn.c | 5 | ||||
| -rw-r--r-- | source/blender/src/writemovie.c | 3 | ||||
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h | 4 | ||||
| -rw-r--r-- | source/nan_compile.mk | 4 |
4 files changed, 15 insertions, 1 deletions
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index e682f17a386..d26e39e5bcc 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -259,8 +259,13 @@ void *MEM_mapallocN(unsigned int len, const char *str) len = (len + 3 ) & ~3; /* allocate in units of 4 */ +#if defined(__sgi) + memh= mmap(0, len+sizeof(MemHead)+sizeof(MemTail), + PROT_READ|PROT_WRITE, MAP_SHARED, -1, 0); +#else memh= mmap(0, len+sizeof(MemHead)+sizeof(MemTail), PROT_READ|PROT_WRITE, MAP_SHARED|MAP_ANON, -1, 0); +#endif if(memh!=(MemHead *)-1) { make_memhead_header(memh, len, str); diff --git a/source/blender/src/writemovie.c b/source/blender/src/writemovie.c index 3491f4f0f60..2d828f1213b 100644 --- a/source/blender/src/writemovie.c +++ b/source/blender/src/writemovie.c @@ -30,7 +30,8 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ -#ifdef __sgi +//#ifdef __sgi +#if 0 #include <unistd.h> #include <movie.h> diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h index 00d1d0c9d05..26217c1d78e 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h @@ -52,6 +52,10 @@ # undef __glext_h_ #endif +#ifdef __sgi +# undef GL_ARB_vertex_program +#endif + #include "glext.h" #include "EXT_separate_specular_color.h" diff --git a/source/nan_compile.mk b/source/nan_compile.mk index 1201d3e546e..736a3c56ec8 100644 --- a/source/nan_compile.mk +++ b/source/nan_compile.mk @@ -117,7 +117,11 @@ ifeq ($(OS),irix) CCC = CC CFLAGS += -n32 -mips3 -Xcpluscomm CCFLAGS += -n32 -mips3 -Xcpluscomm -LANG:std +ifdef MIPS73_ISOHEADERS CCFLAGS += -LANG:libc_in_namespace_std=off -I$(MIPS73_ISOHEADERS) +else + CCFLAGS += -LANG:libc_in_namespace_std=off +endif REL_CFLAGS += -n32 -mips3 -O2 -OPT:Olimit=0 REL_CCFLAGS += -n32 -mips3 -O2 -OPT:Olimit=0 OPENGL_HEADERS = /usr/include |