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/opennl | |
| parent | b4907ced60d518cc55e36715defe6f18ba769c29 (diff) | |
remove support for irix
Diffstat (limited to 'intern/opennl')
| -rw-r--r-- | intern/opennl/superlu/superlu_sys_types.h | 18 |
1 files changed, 11 insertions, 7 deletions
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 */ |