[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35025] trunk/blender/intern/guardedalloc: doxygen: some code shuffle to prevent clashing file names, ensure MEM_guardedalloc.h also shows in docs
Nathan Letwory
nathan at letworyinteractive.com
Mon Feb 21 12:38:55 CET 2011
Revision: 35025
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35025
Author: jesterking
Date: 2011-02-21 11:38:55 +0000 (Mon, 21 Feb 2011)
Log Message:
-----------
doxygen: some code shuffle to prevent clashing file names, ensure MEM_guardedalloc.h also shows in docs
Modified Paths:
--------------
trunk/blender/intern/guardedalloc/MEM_guardedalloc.h
trunk/blender/intern/guardedalloc/mmap_win.h
Added Paths:
-----------
trunk/blender/intern/guardedalloc/MEM_sys_types.h
Removed Paths:
-------------
trunk/blender/intern/guardedalloc/BLO_sys_types.h
Deleted: trunk/blender/intern/guardedalloc/BLO_sys_types.h
===================================================================
--- trunk/blender/intern/guardedalloc/BLO_sys_types.h 2011-02-21 10:15:19 UTC (rev 35024)
+++ trunk/blender/intern/guardedalloc/BLO_sys_types.h 2011-02-21 11:38:55 UTC (rev 35025)
@@ -1,130 +0,0 @@
-/*
- * $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., 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 *****
- * 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
-*/
-
-/** \file BLO_sys_types.h
- * \ingroup MEM
- * \todo solve naming issue BLO -> MEM
- */
-
-#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__) || defined(__NetBSD__)
-
- /* 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: trunk/blender/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- trunk/blender/intern/guardedalloc/MEM_guardedalloc.h 2011-02-21 10:15:19 UTC (rev 35024)
+++ trunk/blender/intern/guardedalloc/MEM_guardedalloc.h 2011-02-21 11:38:55 UTC (rev 35025)
@@ -27,6 +27,7 @@
*/
/** \file MEM_guardedalloc.h
+ * \ingroup MEM
*
* \author Copyright (C) 2001 NaN Technologies B.V.
* \brief Guarded memory (de)allocation
@@ -55,7 +56,7 @@
#define MEM_MALLOCN_H
#include "stdio.h" /* needed for FILE* */
-#include "BLO_sys_types.h" /* needed for uintptr_t */
+#include "MEM_sys_types.h" /* needed for uintptr_t */
#ifndef WARN_UNUSED
# ifdef __GNUC__
Copied: trunk/blender/intern/guardedalloc/MEM_sys_types.h (from rev 35022, trunk/blender/intern/guardedalloc/BLO_sys_types.h)
===================================================================
--- trunk/blender/intern/guardedalloc/MEM_sys_types.h (rev 0)
+++ trunk/blender/intern/guardedalloc/MEM_sys_types.h 2011-02-21 11:38:55 UTC (rev 35025)
@@ -0,0 +1,131 @@
+/*
+ * $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., 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 *****
+ * 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
+*/
+
+/** \file MEM_sys_types.h
+ * \ingroup MEM
+ */
+
+#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__) || defined(__NetBSD__)
+
+ /* 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: trunk/blender/intern/guardedalloc/mmap_win.h
===================================================================
--- trunk/blender/intern/guardedalloc/mmap_win.h 2011-02-21 10:15:19 UTC (rev 35024)
+++ trunk/blender/intern/guardedalloc/mmap_win.h 2011-02-21 11:38:55 UTC (rev 35025)
@@ -50,7 +50,7 @@
#define MAP_FAILED ((void *)-1)
-#include "BLO_sys_types.h" // needed for intptr_t
+#include "MEM_sys_types.h" // needed for intptr_t
void *mmap(void *start, size_t len, int prot, int flags, int fd, off_t offset);
intptr_t munmap(void *ptr, intptr_t size);
More information about the Bf-blender-cvs
mailing list