diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-09-21 12:40:30 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-21 12:40:30 +0400 |
commit | 4b449aefea62999aecd0610e6d7f25e6e927c529 (patch) | |
tree | f061e337d00de3424f0af907c88f4da676befcd9 /intern | |
parent | b4907ced60d518cc55e36715defe6f18ba769c29 (diff) |
remove support for irix
Diffstat (limited to 'intern')
-rw-r--r-- | intern/ghost/SConscript | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.cpp | 26 | ||||
-rw-r--r-- | intern/guardedalloc/MEM_sys_types.h | 15 | ||||
-rw-r--r-- | intern/guardedalloc/intern/mallocn.c | 13 | ||||
-rw-r--r-- | intern/opennl/superlu/superlu_sys_types.h | 18 |
5 files changed, 24 insertions, 50 deletions
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 82f65c1c8ae..1bbc8398574 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -26,7 +26,7 @@ if env['WITH_GHOST_SDL']: pass incs += ' ' + env['BF_SDL_INC'] defs += ['WITH_GHOST_SDL'] -elif window_system in ('linux', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'irix6', 'aix4', 'aix5'): +elif window_system in ('linux', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'aix4', 'aix5'): for f in pf: try: sources.remove('intern' + os.sep + f + 'Win32.cpp') diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index d5100e589f2..63bfa9619e4 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -57,16 +57,6 @@ #include <X11/XF86keysym.h> #endif -#ifdef __sgi - -#if defined(_SGI_EXTRA_PREDEFINES) && !defined(NO_FAST_ATOMS) -#include <X11/SGIFastAtom.h> -#else -#define XSGIFastInternAtom(dpy,string,fast_name,how) XInternAtom(dpy,string,how) -#endif - -#endif - // For timing #include <sys/time.h> @@ -98,16 +88,9 @@ GHOST_SystemX11( std::cerr << "Unable to open a display" << std::endl; abort(); //was return before, but this would just mean it will crash later } - -#ifdef __sgi - m_delete_window_atom - = XSGIFastInternAtom(m_display, - "WM_DELETE_WINDOW", - SGI_XA_WM_DELETE_WINDOW, False); -#else + m_delete_window_atom = XInternAtom(m_display, "WM_DELETE_WINDOW", True); -#endif m_wm_protocols= XInternAtom(m_display, "WM_PROTOCOLS", False); m_wm_take_focus= XInternAtom(m_display, "WM_TAKE_FOCUS", False); @@ -630,7 +613,6 @@ GHOST_SystemX11::processEvent(XEvent *xe) { XClientMessageEvent & xcme = xe->xclient; -#ifndef __sgi if (((Atom)xcme.data.l[0]) == m_delete_window_atom) { g_event = new GHOST_Event( @@ -638,10 +620,8 @@ GHOST_SystemX11::processEvent(XEvent *xe) GHOST_kEventWindowClose, window ); - } else -#endif - - if (((Atom)xcme.data.l[0]) == m_wm_take_focus) { + } + else if (((Atom)xcme.data.l[0]) == m_wm_take_focus) { XWindowAttributes attr; Window fwin; int revert_to; diff --git a/intern/guardedalloc/MEM_sys_types.h b/intern/guardedalloc/MEM_sys_types.h index 4debb32b5c4..23c367d765a 100644 --- a/intern/guardedalloc/MEM_sys_types.h +++ b/intern/guardedalloc/MEM_sys_types.h @@ -25,6 +25,11 @@ * Contributor(s): none yet. * * ***** END GPL LICENSE BLOCK ***** + */ + +/** \file MEM_sys_types.h + * \ingroup MEM + * * A platform-independent definition of [u]intXX_t * Plus the accompanying header include for htonl/ntohl * @@ -44,10 +49,6 @@ // doxygen would get a conflict */ -/** \file MEM_sys_types.h - * \ingroup MEM - */ - #ifndef MEM_SYS_TYPES_H #define MEM_SYS_TYPES_H @@ -60,6 +61,7 @@ extern "C" { /* The __intXX are built-in types of the visual complier! So we don't * need to include anything else here. */ + typedef signed __int8 int8_t; typedef signed __int16 int16_t; typedef signed __int32 int32_t; @@ -104,11 +106,12 @@ unsigned long __attribute__((__stdcall__)) htonl(unsigned long); #else - /* FreeBSD, Irix, Solaris */ + /* FreeBSD, Solaris */ #include <sys/types.h> #endif /* ifdef platform for types */ + #ifdef _WIN32 #ifndef FREE_WINDOWS #ifndef htonl @@ -122,7 +125,7 @@ unsigned long __attribute__((__stdcall__)) htonl(unsigned long); #include <sys/param.h> #elif defined (__APPLE__) #include <sys/types.h> -#else /* irix sun linux */ +#else /* sun linux */ #include <netinet/in.h> #endif /* ifdef platform for htonl/ntohl */ diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index c3ff851f3bc..3614445ad27 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -364,22 +364,9 @@ void *MEM_mapallocN(size_t len, const char *str) mem_lock_thread(); len = (len + 3 ) & ~3; /* allocate in units of 4 */ - -#ifdef __sgi - { -#include <fcntl.h> - - int fd; - fd = open("/dev/zero", O_RDWR); - memh= mmap(0, len+sizeof(MemHead)+sizeof(MemTail), - PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); - close(fd); - } -#else memh= mmap(NULL, 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/intern/opennl/superlu/superlu_sys_types.h b/intern/opennl/superlu/superlu_sys_types.h index c154b4c50ac..9bdf3434582 100644 --- a/intern/opennl/superlu/superlu_sys_types.h +++ b/intern/opennl/superlu/superlu_sys_types.h @@ -25,6 +25,11 @@ * Contributor(s): none yet. * * ***** END GPL LICENSE BLOCK ***** + */ + +/** \file superlu_sys_types.h + * \ingroup opennl + * * A platform-independent definition of [u]intXX_t * Plus the accompanying header include for htonl/ntohl * @@ -37,10 +42,6 @@ * */ -/** \file superlu_sys_types.h - * \ingroup opennl - */ - /* // DG: original BLO_sys_types.h is in source/blender/blenkernel @@ -99,29 +100,32 @@ typedef unsigned long uintptr_t; #include <inttypes.h> #elif defined(FREE_WINDOWS) - +/* define htoln here, there must be a syntax error in winsock2.h in MinGW */ +unsigned long __attribute__((__stdcall__)) htonl(unsigned long); #include <stdint.h> #else - /* FreeBSD, Irix, Solaris */ + /* FreeBSD, Solaris */ #include <sys/types.h> #endif /* ifdef platform for types */ #ifdef _WIN32 +#ifndef FREE_WINDOWS #ifndef htonl #define htonl(x) correctByteOrder(x) #endif #ifndef ntohl #define ntohl(x) correctByteOrder(x) #endif +#endif #elif defined (__FreeBSD__) || defined (__OpenBSD__) #include <sys/param.h> #elif defined (__APPLE__) #include <sys/types.h> -#else /* irix sun linux */ +#else /* sun linux */ #include <netinet/in.h> #endif /* ifdef platform for htonl/ntohl */ |