4 files changed, 5 insertions, 145 deletions
diff --git a/intern/guardedalloc/CMakeLists.txt b/intern/guardedalloc/CMakeLists.txt
index 243dc462e65..4f6c177ef7d 100644
--- a/intern/guardedalloc/CMakeLists.txt
+++ b/intern/guardedalloc/CMakeLists.txt
@@ -35,7 +35,6 @@ set(SRC
 	./intern/mallocn.c
 
 	MEM_guardedalloc.h
-	MEM_sys_types.h
 )
 
 if(WIN32 AND NOT UNIX)
diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h
index beffaece865..d49dc4b4dd9 100644
--- a/intern/guardedalloc/MEM_guardedalloc.h
+++ b/intern/guardedalloc/MEM_guardedalloc.h
@@ -61,7 +61,9 @@
 #define __MEM_GUARDEDALLOC_H__
 
 #include <stdio.h>          /* needed for FILE* */
-#include "MEM_sys_types.h"  /* needed for uintptr_t */
+
+/* needed for uintptr_t, exception, dont use BLI anywhere else in MEM_* */
+#include "../../source/blender/blenlib/BLI_sys_types.h"
 
 /* some GNU attributes are only available from GCC 4.3 */
 #define MEM_GNU_ATTRIBUTES (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 403))
diff --git a/intern/guardedalloc/MEM_sys_types.h b/intern/guardedalloc/MEM_sys_types.h
deleted file mode 100644
index 72563fc988d..00000000000
--- a/intern/guardedalloc/MEM_sys_types.h
+++ /dev/null
@@ -1,142 +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 MEM_sys_types.h
- *  \ingroup MEM
- *
- * 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 BLO_sys_types.h is in source/blender/blenkernel 
-// but is not allowed be accessed here because of bad-level-call
-// jesterKing: I've renamed this to MEM_sys_types.h, because otherwise
-// doxygen would get a conflict
-*/
-
-#ifndef __MEM_SYS_TYPES_H__
-#define __MEM_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>
-
-/* 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 /* __MEM_SYS_TYPES_H__ */
diff --git a/intern/guardedalloc/mmap_win.h b/intern/guardedalloc/mmap_win.h
index fdbb249a932..c84882b1052 100644
--- a/intern/guardedalloc/mmap_win.h
+++ b/intern/guardedalloc/mmap_win.h
@@ -48,7 +48,8 @@
 
 #define MAP_FAILED ((void *)-1)
 
-#include "MEM_sys_types.h" // needed for intptr_t
+/* needed for uintptr_t, exception, dont use BLI anywhere else in MEM_* */
+#include "../../source/blender/blenlib/BLI_sys_types.h"
 
 void *mmap(void *start, size_t len, int prot, int flags, int fd, off_t offset);
 intptr_t munmap(void *ptr, intptr_t size);