diff options
-rw-r--r-- | intern/opennl/CMakeLists.txt | 1 | ||||
-rw-r--r-- | intern/opennl/superlu/smemory.c | 4 | ||||
-rw-r--r-- | intern/opennl/superlu/superlu_sys_types.h | 133 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_sys_types.h | 4 | ||||
-rw-r--r-- | source/blender/blenloader/BLO_sys_types.h | 135 |
5 files changed, 5 insertions, 272 deletions
diff --git a/intern/opennl/CMakeLists.txt b/intern/opennl/CMakeLists.txt index 754036de101..af8fde8572b 100644 --- a/intern/opennl/CMakeLists.txt +++ b/intern/opennl/CMakeLists.txt @@ -84,7 +84,6 @@ set(SRC superlu/xerbla.c extern/ONL_opennl.h - superlu/superlu_sys_types.h superlu/Cnames.h superlu/ssp_defs.h superlu/supermatrix.h diff --git a/intern/opennl/superlu/smemory.c b/intern/opennl/superlu/smemory.c index 3196947b05a..7a2821a4068 100644 --- a/intern/opennl/superlu/smemory.c +++ b/intern/opennl/superlu/smemory.c @@ -11,7 +11,9 @@ */ #include "ssp_defs.h" -#include "superlu_sys_types.h" // needed for intptr_t + +/* blender only: needed for int_ptr, no other BLI used here */ +#include "../../../source/blender/blenlib/BLI_sys_types.h" /* Constants */ #define NO_MEMTYPE 4 /* 0: lusup; diff --git a/intern/opennl/superlu/superlu_sys_types.h b/intern/opennl/superlu/superlu_sys_types.h deleted file mode 100644 index 0e32be13323..00000000000 --- a/intern/opennl/superlu/superlu_sys_types.h +++ /dev/null @@ -1,133 +0,0 @@ -/* - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * 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 - * - * This file includes <sys/types.h> to define [u]intXX_t types, where - * XX can be 8, 16, 32 or 64. Unfortunately, not all systems have this - * file. - * - Windows uses __intXX compiler-builtin types. These are signed, - * so we have to flip the signs. - * For these rogue platforms, we make the typedefs ourselves. - * - */ - - -/* -// DG: original BLI_sys_types.h is in source/blender/blenkernel -// but is not allowed be accessed here because of bad-level-call -// jesterKing: renamed to superlu_sys_types.h -*/ - -#ifndef SUPERLU_SYS_TYPES_H -#define SUPERLU_SYS_TYPES_H - -#ifdef __cplusplus -extern "C" { -#endif - -#if defined(_WIN32) && !defined(FREE_WINDOWS) - -/* 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; -typedef signed __int64 int64_t; - -typedef unsigned __int8 uint8_t; -typedef unsigned __int16 uint16_t; -typedef unsigned __int32 uint32_t; -typedef unsigned __int64 uint64_t; - -#ifndef _INTPTR_T_DEFINED -#ifdef _WIN64 -typedef __int64 intptr_t; -#else -typedef long intptr_t; -#endif -#define _INTPTR_T_DEFINED -#endif - -#ifndef _UINTPTR_T_DEFINED -#ifdef _WIN64 -typedef unsigned __int64 uintptr_t; -#else -typedef unsigned long uintptr_t; -#endif -#define _UINTPTR_T_DEFINED -#endif - -#elif defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) - - /* Linux-i386, Linux-Alpha, Linux-ppc */ -#include <stdint.h> - -#elif defined (__APPLE__) - -#include <inttypes.h> - -#elif defined(FREE_WINDOWS) -#include <stdint.h> - -#else - - /* 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 /* sun linux */ -#include <netinet/in.h> -#endif /* ifdef platform for htonl/ntohl */ - -#ifdef __cplusplus -} -#endif - -#endif /* SUPERLU_SYS_TYPES_H */ - diff --git a/source/blender/blenlib/BLI_sys_types.h b/source/blender/blenlib/BLI_sys_types.h index 96eb68e288e..e544006fd69 100644 --- a/source/blender/blenlib/BLI_sys_types.h +++ b/source/blender/blenlib/BLI_sys_types.h @@ -48,7 +48,7 @@ extern "C" { #endif /* MSVC 2010 and 2012 (>=1600) have stdint.h so we should use this for consistency */ -#if defined(_WIN32) && !defined(FREE_WINDOWS) && _MSC_VER <= 1500 +#if defined(_WIN32) && defined(_MSC_VER) && _MSC_VER <= 1500 /* The __intXX are built-in types of the visual compiler! So we don't * need to include anything else here. */ @@ -101,7 +101,7 @@ typedef uint64_t u_int64_t; #include <inttypes.h> /* MinGW and MSVC >= 2010 */ -#elif defined(FREE_WINDOWS) || _MSC_VER >= 1600 +#elif defined(FREE_WINDOWS) || (defined(_MSC_VER) && _MSC_VER >= 1600) #include <stdint.h> #else diff --git a/source/blender/blenloader/BLO_sys_types.h b/source/blender/blenloader/BLO_sys_types.h deleted file mode 100644 index 73434259432..00000000000 --- a/source/blender/blenloader/BLO_sys_types.h +++ /dev/null @@ -1,135 +0,0 @@ -/* - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** \file blenloader/BLO_sys_types.h - * \ingroup blenloader - * - * A platform-independent definition of [u]intXX_t - * Plus the accompanying header include for htonl/ntohl - * - * This file includes <sys/types.h> to define [u]intXX_t types, where - * XX can be 8, 16, 32 or 64. Unfortunately, not all systems have this - * file. - * - Windows uses __intXX compiler-builtin types. These are signed, - * so we have to flip the signs. - * For these rogue platforms, we make the typedefs ourselves. - * - */ - -#ifndef __BLO_SYS_TYPES_H__ -#define __BLO_SYS_TYPES_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#if defined(_WIN32) && !defined(FREE_WINDOWS) - -/* The __intXX are built-in types of the visual compiler! 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; -typedef signed __int64 int64_t; - -typedef unsigned __int8 uint8_t; -typedef unsigned __int16 uint16_t; -typedef unsigned __int32 uint32_t; -typedef unsigned __int64 uint64_t; - -#ifndef _INTPTR_T_DEFINED -#ifdef _WIN64 -typedef __int64 intptr_t; -#else -typedef long intptr_t; -#endif -#define _INTPTR_T_DEFINED -#endif - -#ifndef _UINTPTR_T_DEFINED -#ifdef _WIN64 -typedef unsigned __int64 uintptr_t; -#else -typedef unsigned long uintptr_t; -#endif -#define _UINTPTR_T_DEFINED -#endif - -#elif defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) - -/* Linux-i386, Linux-Alpha, Linux-ppc */ -#include <stdint.h> - -/* XXX */ -#ifndef UINT64_MAX -# define UINT64_MAX 18446744073709551615 -typedef uint8_t u_int8_t; -typedef uint16_t u_int16_t; -typedef uint32_t u_int32_t; -typedef uint64_t u_int64_t; -#endif - -#elif defined(__APPLE__) - -#include <inttypes.h> - -#elif defined(FREE_WINDOWS) -#include <stdint.h> - -#else - -/* 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 /* sun linux */ -#include <netinet/in.h> -#endif /* ifdef platform for htonl/ntohl */ - -#ifdef __cplusplus -} -#endif - -#endif /* eof */ - |