Revision: 17851 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17851 Author: unclezeiv Date: 2008-12-14 17:44:13 +0100 (Sun, 14 Dec 2008)
Log Message: ----------- svn merge -r 17830:17850 https://svn.blender.org/svnroot/bf-blender/trunk/blender Modified Paths: -------------- branches/soc-2008-unclezeiv/intern/guardedalloc/BLO_sys_types.h branches/soc-2008-unclezeiv/intern/guardedalloc/intern/mmap_win.c branches/soc-2008-unclezeiv/intern/guardedalloc/mmap_win.h branches/soc-2008-unclezeiv/intern/opennl/superlu/BLO_sys_types.h branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_bmesh.h branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_bmeshCustomData.h branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_bullet.h branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_suggestions.h branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/BME_mesh.c branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/BME_structure.c branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/BME_tools.c branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/bmesh_private.h branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/bullet.c branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/suggestions.c branches/soc-2008-unclezeiv/source/blender/blenlib/BLI_mempool.h branches/soc-2008-unclezeiv/source/blender/blenlib/intern/BLI_mempool.c branches/soc-2008-unclezeiv/source/blender/blenlib/intern/fnmatch.c branches/soc-2008-unclezeiv/source/blender/gpu/intern/gpu_codegen.c branches/soc-2008-unclezeiv/source/blender/nodes/TEX_node.h branches/soc-2008-unclezeiv/source/blender/nodes/intern/TEX_nodes/Makefile branches/soc-2008-unclezeiv/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c branches/soc-2008-unclezeiv/source/blender/nodes/intern/TEX_nodes/TEX_checker.c branches/soc-2008-unclezeiv/source/blender/nodes/intern/TEX_nodes/TEX_coord.c branches/soc-2008-unclezeiv/source/blender/nodes/intern/TEX_nodes/TEX_curves.c branches/soc-2008-unclezeiv/source/blender/nodes/intern/TEX_nodes/TEX_distance.c branches/soc-2008-unclezeiv/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c branches/soc-2008-unclezeiv/source/blender/nodes/intern/TEX_nodes/TEX_image.c branches/soc-2008-unclezeiv/source/blender/nodes/intern/TEX_nodes/TEX_invert.c branches/soc-2008-unclezeiv/source/blender/nodes/intern/TEX_nodes/TEX_math.c branches/soc-2008-unclezeiv/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c branches/soc-2008-unclezeiv/source/blender/nodes/intern/TEX_nodes/TEX_output.c branches/soc-2008-unclezeiv/source/blender/nodes/intern/TEX_nodes/TEX_proc.c branches/soc-2008-unclezeiv/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c branches/soc-2008-unclezeiv/source/blender/nodes/intern/TEX_nodes/TEX_texture.c branches/soc-2008-unclezeiv/source/blender/nodes/intern/TEX_nodes/TEX_translate.c branches/soc-2008-unclezeiv/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c branches/soc-2008-unclezeiv/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c branches/soc-2008-unclezeiv/source/blender/nodes/intern/TEX_util.c branches/soc-2008-unclezeiv/source/blender/nodes/intern/TEX_util.h branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Renderlayer.py branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/SConscript branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_ShapeActionActuator.cpp branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_ShapeActionActuator.h branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_ShapeDeformer.cpp branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_ShapeDeformer.h branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_ActuatorEventManager.h branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_ActuatorSensor.h branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_DelaySensor.cpp branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_DelaySensor.h branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_NANDController.cpp branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_NANDController.h branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_NORController.cpp branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_NORController.h branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_XNORController.cpp branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_XNORController.h branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_XORController.cpp branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_XORController.h branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/xembed/UnixShell.c branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/xembed/blender_plugin_types.h branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/xembed/npunix.c branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_ParentActuator.cpp branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_ParentActuator.h branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_PolyProxy.cpp branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_PolyProxy.h branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_StateActuator.cpp branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_StateActuator.h branches/soc-2008-unclezeiv/source/gameengine/PyDoc/BL_ShapeActionActuator.py branches/soc-2008-unclezeiv/source/gameengine/PyDoc/KX_ActuatorSensor.py branches/soc-2008-unclezeiv/source/gameengine/PyDoc/KX_ParentActuator.py branches/soc-2008-unclezeiv/source/gameengine/PyDoc/KX_PolyProxy.py branches/soc-2008-unclezeiv/source/gameengine/PyDoc/KX_StateActuator.py branches/soc-2008-unclezeiv/source/gameengine/PyDoc/SCA_DelaySensor.py branches/soc-2008-unclezeiv/source/gameengine/PyDoc/SConscript Modified: branches/soc-2008-unclezeiv/intern/guardedalloc/BLO_sys_types.h =================================================================== --- branches/soc-2008-unclezeiv/intern/guardedalloc/BLO_sys_types.h 2008-12-14 16:01:30 UTC (rev 17850) +++ branches/soc-2008-unclezeiv/intern/guardedalloc/BLO_sys_types.h 2008-12-14 16:44:13 UTC (rev 17851) @@ -1,125 +1,125 @@ -/** - * $Id$ - * - * ***** 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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 ***** - * 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 -*/ - -#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 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__) - - /* Linux-i386, Linux-Alpha, Linux-ppc */ -#include <stdint.h> - -#elif defined (__APPLE__) - -#include <inttypes.h> - -#elif defined(FREE_WINDOWS) - -#include <stdint.h> - -#else - - /* FreeBSD, Irix, Solaris */ -#include <sys/types.h> - -#endif /* ifdef platform for types */ - -#ifdef _WIN32 -#ifndef htonl -#define htonl(x) correctByteOrder(x) -#endif -#ifndef ntohl -#define ntohl(x) correctByteOrder(x) -#endif -#elif defined (__FreeBSD__) || defined (__OpenBSD__) -#include <sys/param.h> -#elif defined (__APPLE__) -#include <sys/types.h> -#else /* irix sun linux */ -#include <netinet/in.h> -#endif /* ifdef platform for htonl/ntohl */ - -#ifdef __cplusplus -} -#endif - -#endif /* eof */ - +/** + * $Id$ + * + * ***** 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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 ***** + * 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 +*/ + +#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 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__) + + /* Linux-i386, Linux-Alpha, Linux-ppc */ +#include <stdint.h> + +#elif defined (__APPLE__) + +#include <inttypes.h> + +#elif defined(FREE_WINDOWS) + +#include <stdint.h> + +#else + + /* FreeBSD, Irix, Solaris */ +#include <sys/types.h> + +#endif /* ifdef platform for types */ + +#ifdef _WIN32 +#ifndef htonl +#define htonl(x) correctByteOrder(x) +#endif +#ifndef ntohl +#define ntohl(x) correctByteOrder(x) +#endif +#elif defined (__FreeBSD__) || defined (__OpenBSD__) +#include <sys/param.h> +#elif defined (__APPLE__) +#include <sys/types.h> +#else /* irix sun linux */ +#include <netinet/in.h> +#endif /* ifdef platform for htonl/ntohl */ + +#ifdef __cplusplus +} +#endif + +#endif /* eof */ + Modified: branches/soc-2008-unclezeiv/intern/guardedalloc/intern/mmap_win.c =================================================================== --- branches/soc-2008-unclezeiv/intern/guardedalloc/intern/mmap_win.c 2008-12-14 16:01:30 UTC (rev 17850) +++ branches/soc-2008-unclezeiv/intern/guardedalloc/intern/mmap_win.c 2008-12-14 16:44:13 UTC (rev 17851) @@ -1,260 +1,260 @@ -/** - * $Id: $ - * - * ***** 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2008 Blender Foundation. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): Andrea Weikert. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#if defined(WIN32) - -#include <windows.h> -#include <errno.h> -#include <io.h> -#include <sys/types.h> -#include <stdio.h> - -#include "mmap_win.h" - -#ifndef FILE_MAP_EXECUTE -//not defined in earlier versions of the Platform SDK (before February 2003) -#define FILE_MAP_EXECUTE 0x0020 -#endif - -/* --------------------------------------------------------------------- */ -/* local storage definitions */ -/* --------------------------------------------------------------------- */ -/* all memory mapped chunks are put in linked lists */ -typedef struct mmapLink -{ - struct mmapLink *next,*prev; -} mmapLink; - -typedef struct mmapListBase -{ - void *first, *last; -} mmapListBase; - -typedef struct MemMap { - struct MemMap *next,*prev; - void *mmap; - HANDLE fhandle; - HANDLE maphandle; -} MemMap; - -/* --------------------------------------------------------------------- */ -/* local functions */ -/* --------------------------------------------------------------------- */ - -static void mmap_addtail(volatile mmapListBase *listbase, void *vlink); -static void mmap_remlink(volatile mmapListBase *listbase, void *vlink); -static void *mmap_findlink(volatile mmapListBase *listbase, void *ptr); - -static int mmap_get_prot_flags (int flags); -static int mmap_get_access_flags (int flags); - -/* --------------------------------------------------------------------- */ -/* vars */ -/* --------------------------------------------------------------------- */ -volatile static struct mmapListBase _mmapbase; -volatile static struct mmapListBase *mmapbase = &_mmapbase; - - -/* --------------------------------------------------------------------- */ -/* implementation */ -/* --------------------------------------------------------------------- */ - -/* mmap for windows */ -void *mmap(void *start, size_t len, int prot, int flags, int fd, off_t offset) -{ - HANDLE fhandle = INVALID_HANDLE_VALUE; - HANDLE maphandle; - int prot_flags = mmap_get_prot_flags(prot); - int access_flags = mmap_get_access_flags(prot); - MemMap *mm = NULL; - void *ptr = NULL; - - if ( flags & MAP_FIXED ) { - return MAP_FAILED; - } - - /* - if ( fd == -1 ) { - _set_errno( EBADF ); - return MAP_FAILED; - } - */ - - if ( fd != -1 ) { @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs