[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57092] trunk/blender: move BLO_sys_types. h -> BLI_sys_types.h (it had nothing todo with loading)
Campbell Barton
ideasman42 at gmail.com
Tue May 28 21:35:27 CEST 2013
Revision: 57092
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57092
Author: campbellbarton
Date: 2013-05-28 19:35:26 +0000 (Tue, 28 May 2013)
Log Message:
-----------
move BLO_sys_types.h -> BLI_sys_types.h (it had nothing todo with loading)
remove MEM_sys_types.h which was a duplicate.
Modified Paths:
--------------
trunk/blender/extern/carve/include/carve/win32.h
trunk/blender/intern/container/CTR_TaggedIndex.h
trunk/blender/intern/cycles/blender/CMakeLists.txt
trunk/blender/intern/ghost/test/CMakeLists.txt
trunk/blender/intern/guardedalloc/CMakeLists.txt
trunk/blender/intern/guardedalloc/MEM_guardedalloc.h
trunk/blender/intern/guardedalloc/mmap_win.h
trunk/blender/intern/memutil/MEM_Allocator.h
trunk/blender/intern/opennl/superlu/superlu_sys_types.h
trunk/blender/source/blender/SConscript
trunk/blender/source/blender/avi/AVI_avi.h
trunk/blender/source/blender/avi/intern/avi.c
trunk/blender/source/blender/blenfont/CMakeLists.txt
trunk/blender/source/blender/blenfont/SConscript
trunk/blender/source/blender/blenkernel/BKE_customdata.h
trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenkernel/intern/icons.c
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenkernel/intern/mesh_validate.c
trunk/blender/source/blender/blenkernel/intern/seqcache.c
trunk/blender/source/blender/blenlib/CMakeLists.txt
trunk/blender/source/blender/blenlib/intern/BLI_ghash.c
trunk/blender/source/blender/blenlib/intern/endian_switch.c
trunk/blender/source/blender/blenlib/intern/fileops.c
trunk/blender/source/blender/blenloader/CMakeLists.txt
trunk/blender/source/blender/blenloader/intern/readblenentry.c
trunk/blender/source/blender/collada/CMakeLists.txt
trunk/blender/source/blender/collada/SConscript
trunk/blender/source/blender/compositor/CMakeLists.txt
trunk/blender/source/blender/compositor/SConscript
trunk/blender/source/blender/editors/animation/CMakeLists.txt
trunk/blender/source/blender/editors/animation/SConscript
trunk/blender/source/blender/editors/animation/anim_draw.c
trunk/blender/source/blender/editors/animation/anim_ops.c
trunk/blender/source/blender/editors/armature/CMakeLists.txt
trunk/blender/source/blender/editors/armature/SConscript
trunk/blender/source/blender/editors/curve/CMakeLists.txt
trunk/blender/source/blender/editors/curve/SConscript
trunk/blender/source/blender/editors/gpencil/CMakeLists.txt
trunk/blender/source/blender/editors/gpencil/SConscript
trunk/blender/source/blender/editors/gpencil/drawgpencil.c
trunk/blender/source/blender/editors/gpencil/gpencil_ops.c
trunk/blender/source/blender/editors/include/UI_interface.h
trunk/blender/source/blender/editors/interface/CMakeLists.txt
trunk/blender/source/blender/editors/interface/SConscript
trunk/blender/source/blender/editors/io/CMakeLists.txt
trunk/blender/source/blender/editors/io/SConscript
trunk/blender/source/blender/editors/mask/CMakeLists.txt
trunk/blender/source/blender/editors/mask/SConscript
trunk/blender/source/blender/editors/mesh/CMakeLists.txt
trunk/blender/source/blender/editors/mesh/SConscript
trunk/blender/source/blender/editors/metaball/CMakeLists.txt
trunk/blender/source/blender/editors/metaball/SConscript
trunk/blender/source/blender/editors/object/CMakeLists.txt
trunk/blender/source/blender/editors/object/SConscript
trunk/blender/source/blender/editors/object/object_shapekey.c
trunk/blender/source/blender/editors/physics/CMakeLists.txt
trunk/blender/source/blender/editors/physics/SConscript
trunk/blender/source/blender/editors/screen/CMakeLists.txt
trunk/blender/source/blender/editors/screen/SConscript
trunk/blender/source/blender/editors/sculpt_paint/CMakeLists.txt
trunk/blender/source/blender/editors/sculpt_paint/SConscript
trunk/blender/source/blender/editors/sculpt_paint/paint_utils.c
trunk/blender/source/blender/editors/sound/CMakeLists.txt
trunk/blender/source/blender/editors/sound/SConscript
trunk/blender/source/blender/editors/space_action/CMakeLists.txt
trunk/blender/source/blender/editors/space_action/SConscript
trunk/blender/source/blender/editors/space_api/CMakeLists.txt
trunk/blender/source/blender/editors/space_api/SConscript
trunk/blender/source/blender/editors/space_buttons/CMakeLists.txt
trunk/blender/source/blender/editors/space_buttons/SConscript
trunk/blender/source/blender/editors/space_clip/CMakeLists.txt
trunk/blender/source/blender/editors/space_clip/SConscript
trunk/blender/source/blender/editors/space_console/CMakeLists.txt
trunk/blender/source/blender/editors/space_console/SConscript
trunk/blender/source/blender/editors/space_graph/CMakeLists.txt
trunk/blender/source/blender/editors/space_graph/SConscript
trunk/blender/source/blender/editors/space_image/CMakeLists.txt
trunk/blender/source/blender/editors/space_image/SConscript
trunk/blender/source/blender/editors/space_logic/CMakeLists.txt
trunk/blender/source/blender/editors/space_logic/SConscript
trunk/blender/source/blender/editors/space_nla/CMakeLists.txt
trunk/blender/source/blender/editors/space_nla/SConscript
trunk/blender/source/blender/editors/space_node/CMakeLists.txt
trunk/blender/source/blender/editors/space_node/SConscript
trunk/blender/source/blender/editors/space_outliner/CMakeLists.txt
trunk/blender/source/blender/editors/space_outliner/SConscript
trunk/blender/source/blender/editors/space_script/CMakeLists.txt
trunk/blender/source/blender/editors/space_script/SConscript
trunk/blender/source/blender/editors/space_sequencer/CMakeLists.txt
trunk/blender/source/blender/editors/space_sequencer/SConscript
trunk/blender/source/blender/editors/space_text/CMakeLists.txt
trunk/blender/source/blender/editors/space_text/SConscript
trunk/blender/source/blender/editors/space_time/CMakeLists.txt
trunk/blender/source/blender/editors/space_time/SConscript
trunk/blender/source/blender/editors/space_userpref/CMakeLists.txt
trunk/blender/source/blender/editors/space_userpref/SConscript
trunk/blender/source/blender/editors/space_view3d/CMakeLists.txt
trunk/blender/source/blender/editors/space_view3d/SConscript
trunk/blender/source/blender/editors/space_view3d/drawanimviz.c
trunk/blender/source/blender/editors/space_view3d/view3d_project.c
trunk/blender/source/blender/editors/transform/CMakeLists.txt
trunk/blender/source/blender/editors/transform/SConscript
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/editors/util/CMakeLists.txt
trunk/blender/source/blender/editors/util/SConscript
trunk/blender/source/blender/editors/uvedit/CMakeLists.txt
trunk/blender/source/blender/editors/uvedit/SConscript
trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.h
trunk/blender/source/blender/freestyle/CMakeLists.txt
trunk/blender/source/blender/freestyle/SConscript
trunk/blender/source/blender/gpu/CMakeLists.txt
trunk/blender/source/blender/gpu/SConscript
trunk/blender/source/blender/gpu/intern/gpu_codegen.c
trunk/blender/source/blender/imbuf/intern/cineon/CMakeLists.txt
trunk/blender/source/blender/imbuf/intern/cineon/SConscript
trunk/blender/source/blender/imbuf/intern/cineon/logImageCore.h
trunk/blender/source/blender/imbuf/intern/dds/FlipDXT.h
trunk/blender/source/blender/imbuf/intern/scaling.c
trunk/blender/source/blender/makesdna/DNA_defs.h
trunk/blender/source/blender/makesdna/intern/CMakeLists.txt
trunk/blender/source/blender/makesdna/intern/SConscript
trunk/blender/source/blender/makesdna/intern/makesdna.c
trunk/blender/source/blender/makesrna/RNA_types.h
trunk/blender/source/blender/makesrna/SConscript
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
trunk/blender/source/blender/makesrna/intern/SConscript
trunk/blender/source/blender/makesrna/intern/rna_mesh_api.c
trunk/blender/source/blender/makesrna/intern/rna_meta_api.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
trunk/blender/source/blender/makesrna/intern/rna_pose_api.c
trunk/blender/source/blender/modifiers/CMakeLists.txt
trunk/blender/source/blender/modifiers/SConscript
trunk/blender/source/blender/modifiers/intern/MOD_meshcache_mdd.c
trunk/blender/source/blender/modifiers/intern/MOD_meshcache_pc2.c
trunk/blender/source/blender/nodes/CMakeLists.txt
trunk/blender/source/blender/nodes/SConscript
trunk/blender/source/blender/python/generic/CMakeLists.txt
trunk/blender/source/blender/quicktime/CMakeLists.txt
trunk/blender/source/blender/quicktime/SConscript
trunk/blender/source/blender/quicktime/apple/qtkit_export.m
trunk/blender/source/blender/quicktime/apple/qtkit_import.m
trunk/blender/source/blender/quicktime/apple/quicktime_export.c
trunk/blender/source/blender/quicktime/apple/quicktime_import.c
trunk/blender/source/blender/render/CMakeLists.txt
trunk/blender/source/blender/render/SConscript
trunk/blender/source/blender/render/intern/include/render_types.h
trunk/blender/source/blender/windowmanager/intern/wm.c
trunk/blender/source/blender/windowmanager/intern/wm_cursors.c
trunk/blender/source/blenderplayer/bad_level_call_stubs/SConscript
trunk/blender/source/gameengine/Expressions/CMakeLists.txt
trunk/blender/source/gameengine/Expressions/ListValue.cpp
trunk/blender/source/gameengine/Expressions/SConscript
trunk/blender/source/gameengine/Ketsji/KX_MaterialIpoController.cpp
trunk/blender/source/gameengine/Ketsji/SConscript
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
Removed Paths:
-------------
trunk/blender/intern/guardedalloc/MEM_sys_types.h
Modified: trunk/blender/extern/carve/include/carve/win32.h
===================================================================
--- trunk/blender/extern/carve/include/carve/win32.h 2013-05-28 18:36:47 UTC (rev 57091)
+++ trunk/blender/extern/carve/include/carve/win32.h 2013-05-28 19:35:26 UTC (rev 57092)
@@ -37,7 +37,7 @@
#if defined(_WIN32) && !defined(__MINGW32__)
/* The __intXX are built-in types of the visual complier! So we don't
need to include anything else here.
- This typedefs should be in sync with types from MEM_sys_types.h */
+ This typedefs should be in sync with types from BLI_sys_types.h */
typedef signed __int8 int8_t;
typedef signed __int16 int16_t;
Modified: trunk/blender/intern/container/CTR_TaggedIndex.h
===================================================================
--- trunk/blender/intern/container/CTR_TaggedIndex.h 2013-05-28 18:36:47 UTC (rev 57091)
+++ trunk/blender/intern/container/CTR_TaggedIndex.h 2013-05-28 19:35:26 UTC (rev 57092)
@@ -43,7 +43,7 @@
#include <functional>
-#include "MEM_sys_types.h"
+#include "../../source/blender/blenlib/BLI_sys_types.h"
enum {
empty_tag = 0x0,
Modified: trunk/blender/intern/cycles/blender/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/blender/CMakeLists.txt 2013-05-28 18:36:47 UTC (rev 57091)
+++ trunk/blender/intern/cycles/blender/CMakeLists.txt 2013-05-28 19:35:26 UTC (rev 57092)
@@ -10,7 +10,6 @@
../../mikktspace
../../../source/blender/makesdna
../../../source/blender/makesrna
- ../../../source/blender/blenloader
${CMAKE_BINARY_DIR}/source/blender/makesrna/intern
)
Modified: trunk/blender/intern/ghost/test/CMakeLists.txt
===================================================================
--- trunk/blender/intern/ghost/test/CMakeLists.txt 2013-05-28 18:36:47 UTC (rev 57091)
+++ trunk/blender/intern/ghost/test/CMakeLists.txt 2013-05-28 19:35:26 UTC (rev 57092)
@@ -87,7 +87,6 @@
# grr, blenfont needs BLI
include_directories(
"../../../source/blender/blenlib"
- "../../../source/blender/blenloader"
)
add_library(bli_lib
"../../../source/blender/blenlib/intern/fileops.c"
Modified: trunk/blender/intern/guardedalloc/CMakeLists.txt
===================================================================
--- trunk/blender/intern/guardedalloc/CMakeLists.txt 2013-05-28 18:36:47 UTC (rev 57091)
+++ trunk/blender/intern/guardedalloc/CMakeLists.txt 2013-05-28 19:35:26 UTC (rev 57092)
@@ -35,7 +35,6 @@
./intern/mallocn.c
MEM_guardedalloc.h
- MEM_sys_types.h
)
if(WIN32 AND NOT UNIX)
Modified: trunk/blender/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- trunk/blender/intern/guardedalloc/MEM_guardedalloc.h 2013-05-28 18:36:47 UTC (rev 57091)
+++ trunk/blender/intern/guardedalloc/MEM_guardedalloc.h 2013-05-28 19:35:26 UTC (rev 57092)
@@ -61,8 +61,10 @@
#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))
Deleted: trunk/blender/intern/guardedalloc/MEM_sys_types.h
===================================================================
--- trunk/blender/intern/guardedalloc/MEM_sys_types.h 2013-05-28 18:36:47 UTC (rev 57091)
+++ trunk/blender/intern/guardedalloc/MEM_sys_types.h 2013-05-28 19:35:26 UTC (rev 57092)
@@ -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__ */
Modified: trunk/blender/intern/guardedalloc/mmap_win.h
===================================================================
--- trunk/blender/intern/guardedalloc/mmap_win.h 2013-05-28 18:36:47 UTC (rev 57091)
+++ trunk/blender/intern/guardedalloc/mmap_win.h 2013-05-28 19:35:26 UTC (rev 57092)
@@ -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);
Modified: trunk/blender/intern/memutil/MEM_Allocator.h
===================================================================
--- trunk/blender/intern/memutil/MEM_Allocator.h 2013-05-28 18:36:47 UTC (rev 57091)
+++ trunk/blender/intern/memutil/MEM_Allocator.h 2013-05-28 19:35:26 UTC (rev 57092)
@@ -30,7 +30,6 @@
#include <stddef.h>
#include "guardedalloc/MEM_guardedalloc.h"
-#include "guardedalloc/MEM_sys_types.h"
template<typename _Tp>
struct MEM_Allocator
Modified: trunk/blender/intern/opennl/superlu/superlu_sys_types.h
===================================================================
--- trunk/blender/intern/opennl/superlu/superlu_sys_types.h 2013-05-28 18:36:47 UTC (rev 57091)
+++ trunk/blender/intern/opennl/superlu/superlu_sys_types.h 2013-05-28 19:35:26 UTC (rev 57092)
@@ -42,7 +42,7 @@
/*
-// DG: original BLO_sys_types.h is in source/blender/blenkernel
+// 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
*/
Modified: trunk/blender/source/blender/SConscript
===================================================================
--- trunk/blender/source/blender/SConscript 2013-05-28 18:36:47 UTC (rev 57091)
+++ trunk/blender/source/blender/SConscript 2013-05-28 19:35:26 UTC (rev 57092)
@@ -32,7 +32,6 @@
'bmesh/SConscript',
'blenkernel/SConscript',
'blenlib/SConscript',
- 'blenloader/SConscript',
'gpu/SConscript',
'editors/SConscript',
'imbuf/SConscript',
Modified: trunk/blender/source/blender/avi/AVI_avi.h
===================================================================
--- trunk/blender/source/blender/avi/AVI_avi.h 2013-05-28 18:36:47 UTC (rev 57091)
+++ trunk/blender/source/blender/avi/AVI_avi.h 2013-05-28 19:35:26 UTC (rev 57092)
@@ -53,7 +53,7 @@
#ifndef __AVI_AVI_H__
#define __AVI_AVI_H__
-#include "MEM_sys_types.h"
+#include "BLI_sys_types.h"
#include <stdio.h> /* for FILE */
typedef struct _AviChunk {
Modified: trunk/blender/source/blender/avi/intern/avi.c
===================================================================
--- trunk/blender/source/blender/avi/intern/avi.c 2013-05-28 18:36:47 UTC (rev 57091)
+++ trunk/blender/source/blender/avi/intern/avi.c 2013-05-28 19:35:26 UTC (rev 57092)
@@ -43,8 +43,8 @@
#endif
#include "MEM_guardedalloc.h"
-#include "MEM_sys_types.h"
+#include "BLI_sys_types.h"
#include "BLI_utildefines.h"
#include "BLI_fileops.h"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list