[Scummvm-cvs-logs] SF.net SVN: scummvm:[38832] scummvm/trunk/engines/sci
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Tue Feb 24 06:39:10 CET 2009
Revision: 38832
http://scummvm.svn.sourceforge.net/scummvm/?rev=38832&view=rev
Author: fingolfin
Date: 2009-02-24 05:39:10 +0000 (Tue, 24 Feb 2009)
Log Message:
-----------
SCI: Moved engines/sci/include/sci_memory.h and engines/sci/scicore/sci_memory.cpp into engines/sci/; moved macros from the header into the source file
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/aatree.cpp
scummvm/trunk/engines/sci/engine/savegame.cfsml
scummvm/trunk/engines/sci/engine/savegame.cpp
scummvm/trunk/engines/sci/engine/scriptconsole.cpp
scummvm/trunk/engines/sci/engine/sys_strings.cpp
scummvm/trunk/engines/sci/gfx/gfx_pixmap_scale.cpp
scummvm/trunk/engines/sci/gfx/gfx_system.h
scummvm/trunk/engines/sci/gfx/gfx_tools.cpp
scummvm/trunk/engines/sci/gfx/menubar.cpp
scummvm/trunk/engines/sci/gfx/operations.cpp
scummvm/trunk/engines/sci/gfx/resource/sci_font.cpp
scummvm/trunk/engines/sci/gfx/resource/sci_pal_1.cpp
scummvm/trunk/engines/sci/gfx/resource/sci_pic_0.cpp
scummvm/trunk/engines/sci/gfx/resource/sci_resmgr.cpp
scummvm/trunk/engines/sci/gfx/resource/sci_view_0.cpp
scummvm/trunk/engines/sci/gfx/resource/sci_view_1.cpp
scummvm/trunk/engines/sci/gfx/sbtree.cpp
scummvm/trunk/engines/sci/gfx/widgets.cpp
scummvm/trunk/engines/sci/include/heapmgr.h
scummvm/trunk/engines/sci/include/sciconsole.h
scummvm/trunk/engines/sci/module.mk
scummvm/trunk/engines/sci/scicore/decompress0.cpp
scummvm/trunk/engines/sci/scicore/decompress01.cpp
scummvm/trunk/engines/sci/scicore/decompress1.cpp
scummvm/trunk/engines/sci/scicore/decompress11.cpp
scummvm/trunk/engines/sci/scicore/resource.cpp
scummvm/trunk/engines/sci/scicore/resource_map.cpp
scummvm/trunk/engines/sci/scicore/resource_patch.cpp
scummvm/trunk/engines/sci/scicore/sciconsole.cpp
scummvm/trunk/engines/sci/sfx/iterator.cpp
scummvm/trunk/engines/sci/sfx/mixer/soft.cpp
scummvm/trunk/engines/sci/sfx/pcm-iterator.cpp
scummvm/trunk/engines/sci/sfx/seq/instrument-map.cpp
scummvm/trunk/engines/sci/sfx/softseq/amiga.cpp
scummvm/trunk/engines/sci/sfx/songlib.cpp
Added Paths:
-----------
scummvm/trunk/engines/sci/sci_memory.cpp
scummvm/trunk/engines/sci/sci_memory.h
Removed Paths:
-------------
scummvm/trunk/engines/sci/include/sci_memory.h
scummvm/trunk/engines/sci/scicore/sci_memory.cpp
Modified: scummvm/trunk/engines/sci/engine/aatree.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/aatree.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/engine/aatree.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -25,7 +25,7 @@
#include "sci/engine/aatree.h"
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/engine/savegame.cfsml
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cfsml 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/engine/savegame.cfsml 2009-02-24 05:39:10 UTC (rev 38832)
@@ -32,7 +32,7 @@
#include <time.h> // FIXME: For struct tm
#include "common/stream.h"
#include "common/system.h"
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#include "sci/gfx/gfx_operations.h"
#include "sci/gfx/menubar.h"
#include "sci/sfx/sfx_engine.h"
Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -32,7 +32,7 @@
#include <time.h> // FIXME: For struct tm
#include "common/stream.h"
#include "common/system.h"
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#include "sci/gfx/gfx_operations.h"
#include "sci/gfx/menubar.h"
#include "sci/sfx/sfx_engine.h"
@@ -237,7 +237,7 @@
#line 102 "engines/sci/engine/savegame.cfsml"
#include <stdarg.h> // We need va_lists
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#ifdef CFSML_DEBUG_MALLOC
/*
Modified: scummvm/trunk/engines/sci/engine/scriptconsole.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/scriptconsole.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/engine/scriptconsole.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -26,7 +26,7 @@
/* Second half of the console implementation: VM dependent stuff */
/* Remember, it doesn't have to be fast. */
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#include "sci/include/engine.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/engine/sys_strings.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/sys_strings.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/engine/sys_strings.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -25,7 +25,7 @@
#include "sci/tools.h"
#include "sci/include/sys_strings.h"
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/gfx/gfx_pixmap_scale.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_pixmap_scale.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/gfx/gfx_pixmap_scale.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -29,7 +29,7 @@
** EXTRA_BYTE_OFFSET: Extra source byte offset for copying (used on big-endian machines in 24 bit mode)
*/
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/gfx/gfx_system.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_system.h 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/gfx/gfx_system.h 2009-02-24 05:39:10 UTC (rev 38832)
@@ -28,7 +28,7 @@
#include "common/scummsys.h"
#include "common/rect.h"
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#include "sci/tools.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/gfx/gfx_tools.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_tools.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/gfx/gfx_tools.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -23,7 +23,7 @@
*
*/
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#include "sci/gfx/gfx_tools.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/gfx/menubar.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/menubar.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/gfx/menubar.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -28,7 +28,7 @@
** used for any actual actions on behalf of the interpreter.
*/
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#include "sci/include/engine.h"
#include "sci/gfx/menubar.h"
Modified: scummvm/trunk/engines/sci/gfx/operations.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/operations.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/gfx/operations.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -25,7 +25,7 @@
// Graphical operations, called from the widget state manager
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#include "sci/gfx/gfx_operations.h"
#include "common/system.h"
Modified: scummvm/trunk/engines/sci/gfx/resource/sci_font.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/resource/sci_font.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/gfx/resource/sci_font.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -23,7 +23,7 @@
*
*/
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#include "sci/gfx/gfx_system.h"
#include "sci/gfx/gfx_resource.h"
#include "sci/gfx/gfx_tools.h"
Modified: scummvm/trunk/engines/sci/gfx/resource/sci_pal_1.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/resource/sci_pal_1.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/gfx/resource/sci_pal_1.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -26,7 +26,7 @@
/* SCI1 palette resource defrobnicator */
#include "common/file.h"
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#include "sci/gfx/gfx_system.h"
#include "sci/gfx/gfx_resource.h"
Modified: scummvm/trunk/engines/sci/gfx/resource/sci_pic_0.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/resource/sci_pic_0.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/gfx/resource/sci_pic_0.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -24,7 +24,7 @@
*/
#include <time.h> // for time() to seed rand() via srand()
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#include "sci/gfx/gfx_resource.h"
#include "sci/gfx/gfx_tools.h"
Modified: scummvm/trunk/engines/sci/gfx/resource/sci_resmgr.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/resource/sci_resmgr.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/gfx/resource/sci_resmgr.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -25,7 +25,7 @@
// The interpreter-specific part of the resource manager, for SCI
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#include "sci/include/sciresource.h"
#include "sci/gfx/gfx_widgets.h"
#include "sci/gfx/gfx_resmgr.h"
Modified: scummvm/trunk/engines/sci/gfx/resource/sci_view_0.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/resource/sci_view_0.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/gfx/resource/sci_view_0.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -25,7 +25,7 @@
#include "common/endian.h"
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#include "sci/gfx/gfx_system.h"
#include "sci/gfx/gfx_resource.h"
#include "sci/gfx/gfx_tools.h"
Modified: scummvm/trunk/engines/sci/gfx/resource/sci_view_1.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/resource/sci_view_1.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/gfx/resource/sci_view_1.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -27,7 +27,7 @@
#include "common/endian.h"
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#include "sci/gfx/gfx_system.h"
#include "sci/gfx/gfx_resource.h"
#include "sci/gfx/gfx_tools.h"
Modified: scummvm/trunk/engines/sci/gfx/sbtree.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/sbtree.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/gfx/sbtree.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -26,7 +26,7 @@
// Static binary lookup tree lookup
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#include "sci/gfx/sbtree.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/gfx/widgets.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/widgets.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/gfx/widgets.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -23,7 +23,7 @@
*
*/
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#include "sci/gfx/gfx_widgets.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/include/heapmgr.h
===================================================================
--- scummvm/trunk/engines/sci/include/heapmgr.h 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/include/heapmgr.h 2009-02-24 05:39:10 UTC (rev 38832)
@@ -29,7 +29,7 @@
#define _FREESCI_HEAPMGR_H_
#include "sci/tools.h"
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
namespace Sci {
Deleted: scummvm/trunk/engines/sci/include/sci_memory.h
===================================================================
--- scummvm/trunk/engines/sci/include/sci_memory.h 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/include/sci_memory.h 2009-02-24 05:39:10 UTC (rev 38832)
@@ -1,171 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * 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.
- *
- * $URL$
- * $Id$
- *
- */
-
-
-/** This header file defines a portable library for allocating memory safely
- ** throughout FreeSCI.
- ** Implementations of basic functions found here are in this file and
- ** $(SRCDIR)/src/scicore/sci_memory.c
- *
- **************
- *
- * Sets behaviour if memory allocation call fails.
- * UNCHECKED_MALLOCS: use C library routine without checks
- * (nothing defined): check mallocs and exit immediately on fail (recommended)
- *
- ** -- Alex Angas
- **
- **/
-
-
-#ifndef _SCI_MEMORY_H
-#define _SCI_MEMORY_H
-
-#include "common/scummsys.h"
-
-namespace Sci {
-
-/********** the memory allocation macros **********/
-
-#ifdef UNCHECKED_MALLOCS
-
-#define ALLOC_MEM(alloc_statement, size, filename, linenum, funcname)\
-do {\
- alloc_statement;\
-} while (0);
-
-#else /* !UNCHECKED_MALLOCS */
-
-#define ALLOC_MEM(alloc_statement, size, filename, linenum, funcname)\
-do {\
- if (size == 0) {\
- warning("Allocating zero bytes of memory [%s (%s) : %u]", filename, funcname, linenum);\
- } else if (!(size > 0)) {\
- error("Cannot allocate negative bytes of memory [%s (%s) : %u]", filename, funcname, linenum);\
- }\
-\
- alloc_statement; /* attempt to allocate the memory */\
-\
- if (res == NULL) {\
- /* exit immediately */\
- error("Memory allocation of %lu bytes failed [%s (%s) : %u]", size, filename, funcname, linenum);\
- }\
-} while (0);
-
-#endif /* !UNCHECKED_MALLOCS */
-
-
-/********** memory allocation routines **********/
-
-extern void *sci_malloc(size_t size);
-/* Allocates the specified amount of memory.
-** Parameters: (size_t) size: Number of bytes to allocate
-** Returns : (void *) A pointer to the allocated memory chunk
-** To free this string, use the free() command.
-** If the call fails, behaviour is dependent on the definition of SCI_ALLOC.
-*/
-
-extern void *sci_calloc(size_t num, size_t size);
-/* Allocates num * size bytes of zeroed-out memory.
-** Parameters: (size_t) num: Number of elements to allocate
-** (size_t) size: Amount of memory per element to allocate
-** Returns : (void *) A pointer to the allocated memory chunk
-** To free this string, use the free() command.
-** See _SCI_MALLOC() for more information if call fails.
-*/
-
-extern void *sci_realloc(void *ptr, size_t size);
-/* Increases the size of an allocated memory chunk.
-** Parameters: (void *) ptr: The original pointer
-** (size_t) size: New size of the memory chunk
-** Returns : (void *) A possibly new pointer, containing 'size'
-** bytes of memory and everything contained in the original 'ptr'
-** (possibly minus some trailing data if the new memory area is
-** smaller than the old one).
-** To free this string, use the free() command.
-** See _SCI_MALLOC() for more information if call fails.
-*/
-
-
-extern char *sci_strdup(const char *src);
-/* Duplicates a string.
-** Parameters: (const char *) src: The original pointer
-** Returns : (char *) a pointer to the storage location for the copied
-** string.
-** To free this string, use the free() command.
-** See _SCI_MALLOC() for more information if call fails.
-*/
-
-
-extern char *sci_strndup(const char *src, size_t length);
-/* Copies a string into a newly allocated memory part, up to a certain length.
-** Parameters: (char *) src: The source string
-** (int) length: The maximum length of the string (not counting
-** a trailing \0).
-** Returns : (char *) The resulting copy, allocated with sci_malloc().
-** To free this string, use the free() command.
-** See _SCI_MALLOC() for more information if call fails.
-*/
-
-/****************************************/
-/* Refcounting garbage collected memory */
-/****************************************/
-
-/* Refcounting memory calls are a little slower than the others,
-** and using it improperly may cause memory leaks. It conserves
-** memory, though. */
-
-extern void *sci_refcount_alloc(size_t length);
-/* Allocates "garbage" memory
-** Parameters: (size_t) length: Number of bytes to allocate
-** Returns : (void *) The allocated memory
-** Memory allocated in this fashion will be marked as holding one reference.
-** It cannot be freed with 'free()', only by using sci_refcount_decref().
-*/
-
-extern void *sci_refcount_incref(void *data);
-/* Adds another reference to refcounted memory
-** Parameters: (void *) data: The data to add a reference to
-** Returns : (void *) data
-*/
-
-extern void sci_refcount_decref(void *data);
-/* Decrements the reference count for refcounted memory
-** Parameters: (void *) data: The data to add a reference to
-** Returns : (void *) data
-** If the refcount reaches zero, the memory will be deallocated
-*/
-
-extern void *sci_refcount_memdup(void *data, size_t len);
-/* Duplicates non-refcounted memory into a refcounted block
-** Parameters: (void *) data: The memory to copy from
-** (size_t) len: The number of bytes to copy/allocate
-** Returns : (void *) Newly allocated refcounted memory
-** The number of references accounted for will be one.
-*/
-
-} // End of namespace Sci
-
-#endif /* _SCI_MEMORY_H */
Modified: scummvm/trunk/engines/sci/include/sciconsole.h
===================================================================
--- scummvm/trunk/engines/sci/include/sciconsole.h 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/include/sciconsole.h 2009-02-24 05:39:10 UTC (rev 38832)
@@ -34,7 +34,7 @@
#include "common/scummsys.h"
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#include "sci/tools.h"
#include "sci/include/vm_types.h"
Modified: scummvm/trunk/engines/sci/module.mk
===================================================================
--- scummvm/trunk/engines/sci/module.mk 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/module.mk 2009-02-24 05:39:10 UTC (rev 38832)
@@ -5,6 +5,7 @@
detection.o \
exereader.o \
sci.o \
+ sci_memory.o \
tools.o \
engine/aatree.o \
engine/game.o \
@@ -58,7 +59,6 @@
scicore/resource.o \
scicore/resource_map.o \
scicore/resource_patch.o \
- scicore/sci_memory.o \
scicore/script.o \
scicore/versions.o \
scicore/vocab.o \
Copied: scummvm/trunk/engines/sci/sci_memory.cpp (from rev 38822, scummvm/trunk/engines/sci/scicore/sci_memory.cpp)
===================================================================
--- scummvm/trunk/engines/sci/sci_memory.cpp (rev 0)
+++ scummvm/trunk/engines/sci/sci_memory.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -0,0 +1,190 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * 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.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "common/util.h"
+#include "sci/tools.h"
+#include "sci/sci_memory.h"
+
+namespace Sci {
+
+/********** the memory allocation macros **********/
+
+#ifdef UNCHECKED_MALLOCS
+
+#define ALLOC_MEM(alloc_statement, size, filename, linenum, funcname)\
+do {\
+ alloc_statement;\
+} while (0);
+
+#else /* !UNCHECKED_MALLOCS */
+
+#define ALLOC_MEM(alloc_statement, size, filename, linenum, funcname)\
+do {\
+ if (size == 0) {\
+ warning("Allocating zero bytes of memory [%s (%s) : %u]", filename, funcname, linenum);\
+ } else if (!(size > 0)) {\
+ error("Cannot allocate negative bytes of memory [%s (%s) : %u]", filename, funcname, linenum);\
+ }\
+\
+ alloc_statement; /* attempt to allocate the memory */\
+\
+ if (res == NULL) {\
+ /* exit immediately */\
+ error("Memory allocation of %lu bytes failed [%s (%s) : %u]", size, filename, funcname, linenum);\
+ }\
+} while (0);
+
+#endif /* !UNCHECKED_MALLOCS */
+
+
+void * sci_malloc(size_t size) {
+ void *res;
+
+ ALLOC_MEM((res = malloc(size)), size, __FILE__, __LINE__, "")
+ return res;
+}
+
+
+void * sci_calloc(size_t num, size_t size) {
+ void *res;
+
+ ALLOC_MEM((res = calloc(num, size)), num * size, __FILE__, __LINE__, "")
+ return res;
+}
+
+void *sci_realloc(void *ptr, size_t size) {
+ void *res;
+
+ ALLOC_MEM((res = realloc(ptr, size)), size, __FILE__, __LINE__, "")
+ return res;
+}
+
+char *sci_strdup(const char *src) {
+ void *res;
+
+ if (!src) {
+ fprintf(stderr, "_SCI_STRDUP() [%s (%s) : %u]\n",
+ __FILE__, "", __LINE__);
+ fprintf(stderr, " attempt to strdup NULL pointer\n");
+ BREAKPOINT();
+ }
+ ALLOC_MEM((res = strdup(src)), strlen(src), __FILE__, __LINE__, "")
+
+ return (char*)res;
+}
+
+char *sci_strndup(const char *src, size_t length) {
+ void *res;
+ char *strres;
+ size_t rlen = (int)MIN(strlen(src), length) + 1;
+
+ if (!src) {
+ fprintf(stderr, "_SCI_STRNDUP() [%s (%s) : %u]\n",
+ __FILE__, "", __LINE__);
+ fprintf(stderr, " attempt to strndup NULL pointer\n");
+ BREAKPOINT();
+ }
+ ALLOC_MEM((res = malloc(rlen)), rlen, __FILE__, __LINE__, "")
+
+ strres = (char *)res;
+ strncpy(strres, src, rlen);
+ strres[rlen - 1] = 0;
+
+ return strres;
+}
+
+//-------- Refcounting ----------
+
+#define REFCOUNT_OVERHEAD (sizeof(uint32) * 3)
+#define REFCOUNT_MAGIC_LIVE_1 0xebdc1741
+#define REFCOUNT_MAGIC_LIVE_2 0x17015ac9
+#define REFCOUNT_MAGIC_DEAD_1 0x11dead11
+#define REFCOUNT_MAGIC_DEAD_2 0x22dead22
+
+#define REFCOUNT_CHECK(p) ((((uint32 *)(p))[-3] == REFCOUNT_MAGIC_LIVE_2) && (((uint32 *)(p))[-1] == REFCOUNT_MAGIC_LIVE_1))
+
+#define REFCOUNT(p) (((uint32 *)p)[-2])
+
+#undef TRACE_REFCOUNT
+
+extern void *sci_refcount_alloc(size_t length) {
+ uint32 *data = (uint32 *)sci_malloc(REFCOUNT_OVERHEAD + length);
+#ifdef TRACE_REFCOUNT
+ fprintf(stderr, "[] REF: Real-alloc at %p\n", data);
+#endif
+ data += 3;
+
+ data[-1] = REFCOUNT_MAGIC_LIVE_1;
+ data[-3] = REFCOUNT_MAGIC_LIVE_2;
+ REFCOUNT(data) = 1;
+#ifdef TRACE_REFCOUNT
+ fprintf(stderr, "[] REF: Alloc'd %p (ref=%d) OK=%d\n", data, REFCOUNT(data),
+ REFCOUNT_CHECK(data));
+#endif
+ return data;
+}
+
+extern void *sci_refcount_incref(void *data) {
+ if (!REFCOUNT_CHECK(data)) {
+ BREAKPOINT();
+ } else
+ REFCOUNT(data)++;
+
+#ifdef TRACE_REFCOUNT
+ fprintf(stderr, "[] REF: Inc'ing %p (now ref=%d)\n", data, REFCOUNT(data));
+#endif
+ return data;
+}
+
+extern void sci_refcount_decref(void *data) {
+#ifdef TRACE_REFCOUNT
+ fprintf(stderr, "[] REF: Dec'ing %p (prev ref=%d) OK=%d\n", data, REFCOUNT(data),
+ REFCOUNT_CHECK(data));
+#endif
+ if (!REFCOUNT_CHECK(data)) {
+ BREAKPOINT();
+ } else if (--REFCOUNT(data) == 0) {
+ uint32 *fdata = (uint32 *)data;
+
+ fdata[-1] = REFCOUNT_MAGIC_DEAD_1;
+ fdata[-3] = REFCOUNT_MAGIC_DEAD_2;
+
+#ifdef TRACE_REFCOUNT
+ fprintf(stderr, "[] REF: Freeing (%p)...\n", fdata - 3);
+#endif
+ free(fdata - 3);
+#ifdef TRACE_REFCOUNT
+ fprintf(stderr, "[] REF: Done.\n");
+#endif
+ }
+}
+
+extern void *sci_refcount_memdup(void *data, size_t len) {
+ void *dest = sci_refcount_alloc(len);
+ memcpy(dest, data, len);
+ return dest;
+}
+
+} // End of namespace Sci
Copied: scummvm/trunk/engines/sci/sci_memory.h (from rev 38822, scummvm/trunk/engines/sci/include/sci_memory.h)
===================================================================
--- scummvm/trunk/engines/sci/sci_memory.h (rev 0)
+++ scummvm/trunk/engines/sci/sci_memory.h 2009-02-24 05:39:10 UTC (rev 38832)
@@ -0,0 +1,141 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * 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.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+
+/** This header file defines a portable library for allocating memory safely
+ ** throughout FreeSCI.
+ ** Implementations of basic functions found here are in this file and
+ ** $(SRCDIR)/src/scicore/sci_memory.c
+ *
+ **************
+ *
+ * Sets behaviour if memory allocation call fails.
+ * UNCHECKED_MALLOCS: use C library routine without checks
+ * (nothing defined): check mallocs and exit immediately on fail (recommended)
+ *
+ ** -- Alex Angas
+ **
+ **/
+
+
+#ifndef _SCI_MEMORY_H
+#define _SCI_MEMORY_H
+
+#include "common/scummsys.h"
+
+namespace Sci {
+
+/********** memory allocation routines **********/
+
+extern void *sci_malloc(size_t size);
+/* Allocates the specified amount of memory.
+** Parameters: (size_t) size: Number of bytes to allocate
+** Returns : (void *) A pointer to the allocated memory chunk
+** To free this string, use the free() command.
+** If the call fails, behaviour is dependent on the definition of SCI_ALLOC.
+*/
+
+extern void *sci_calloc(size_t num, size_t size);
+/* Allocates num * size bytes of zeroed-out memory.
+** Parameters: (size_t) num: Number of elements to allocate
+** (size_t) size: Amount of memory per element to allocate
+** Returns : (void *) A pointer to the allocated memory chunk
+** To free this string, use the free() command.
+** See _SCI_MALLOC() for more information if call fails.
+*/
+
+extern void *sci_realloc(void *ptr, size_t size);
+/* Increases the size of an allocated memory chunk.
+** Parameters: (void *) ptr: The original pointer
+** (size_t) size: New size of the memory chunk
+** Returns : (void *) A possibly new pointer, containing 'size'
+** bytes of memory and everything contained in the original 'ptr'
+** (possibly minus some trailing data if the new memory area is
+** smaller than the old one).
+** To free this string, use the free() command.
+** See _SCI_MALLOC() for more information if call fails.
+*/
+
+
+extern char *sci_strdup(const char *src);
+/* Duplicates a string.
+** Parameters: (const char *) src: The original pointer
+** Returns : (char *) a pointer to the storage location for the copied
+** string.
+** To free this string, use the free() command.
+** See _SCI_MALLOC() for more information if call fails.
+*/
+
+
+extern char *sci_strndup(const char *src, size_t length);
+/* Copies a string into a newly allocated memory part, up to a certain length.
+** Parameters: (char *) src: The source string
+** (int) length: The maximum length of the string (not counting
+** a trailing \0).
+** Returns : (char *) The resulting copy, allocated with sci_malloc().
+** To free this string, use the free() command.
+** See _SCI_MALLOC() for more information if call fails.
+*/
+
+/****************************************/
+/* Refcounting garbage collected memory */
+/****************************************/
+
+/* Refcounting memory calls are a little slower than the others,
+** and using it improperly may cause memory leaks. It conserves
+** memory, though. */
+
+extern void *sci_refcount_alloc(size_t length);
+/* Allocates "garbage" memory
+** Parameters: (size_t) length: Number of bytes to allocate
+** Returns : (void *) The allocated memory
+** Memory allocated in this fashion will be marked as holding one reference.
+** It cannot be freed with 'free()', only by using sci_refcount_decref().
+*/
+
+extern void *sci_refcount_incref(void *data);
+/* Adds another reference to refcounted memory
+** Parameters: (void *) data: The data to add a reference to
+** Returns : (void *) data
+*/
+
+extern void sci_refcount_decref(void *data);
+/* Decrements the reference count for refcounted memory
+** Parameters: (void *) data: The data to add a reference to
+** Returns : (void *) data
+** If the refcount reaches zero, the memory will be deallocated
+*/
+
+extern void *sci_refcount_memdup(void *data, size_t len);
+/* Duplicates non-refcounted memory into a refcounted block
+** Parameters: (void *) data: The memory to copy from
+** (size_t) len: The number of bytes to copy/allocate
+** Returns : (void *) Newly allocated refcounted memory
+** The number of references accounted for will be one.
+*/
+
+} // End of namespace Sci
+
+#endif /* _SCI_MEMORY_H */
Modified: scummvm/trunk/engines/sci/scicore/decompress0.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/decompress0.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/scicore/decompress0.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -30,7 +30,7 @@
#include "common/stream.h"
#include "common/endian.h"
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#include "sci/include/sciresource.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/scicore/decompress01.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/decompress01.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/scicore/decompress01.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -28,7 +28,7 @@
#include "common/stream.h"
#include "common/endian.h"
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#include "sci/include/sciresource.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/scicore/decompress1.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/decompress1.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/scicore/decompress1.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -28,7 +28,7 @@
#include "common/stream.h"
#include "common/util.h"
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#include "sci/include/sciresource.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/scicore/decompress11.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/decompress11.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/scicore/decompress11.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -27,7 +27,7 @@
#include "common/stream.h"
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#include "sci/include/sciresource.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/scicore/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/resource.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/scicore/resource.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -30,7 +30,7 @@
#include "common/util.h"
#include "sci/tools.h"
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#include "sci/include/sciresource.h"
#include "sci/include/vocabulary.h"
Modified: scummvm/trunk/engines/sci/scicore/resource_map.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/resource_map.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/scicore/resource_map.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -23,7 +23,7 @@
*
*/
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#include "sci/include/sciresource.h"
#include "sci/tools.h"
Modified: scummvm/trunk/engines/sci/scicore/resource_patch.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/resource_patch.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/scicore/resource_patch.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -27,7 +27,7 @@
#include "common/file.h"
#include "sci/include/sciresource.h"
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
namespace Sci {
Deleted: scummvm/trunk/engines/sci/scicore/sci_memory.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/sci_memory.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/scicore/sci_memory.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -1,160 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * 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.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "common/util.h"
-#include "sci/tools.h"
-#include "sci/include/sci_memory.h"
-
-namespace Sci {
-
-void * sci_malloc(size_t size) {
- void *res;
-
- ALLOC_MEM((res = malloc(size)), size, __FILE__, __LINE__, "")
- return res;
-}
-
-
-void * sci_calloc(size_t num, size_t size) {
- void *res;
-
- ALLOC_MEM((res = calloc(num, size)), num * size, __FILE__, __LINE__, "")
- return res;
-}
-
-void *sci_realloc(void *ptr, size_t size) {
- void *res;
-
- ALLOC_MEM((res = realloc(ptr, size)), size, __FILE__, __LINE__, "")
- return res;
-}
-
-char *sci_strdup(const char *src) {
- void *res;
-
- if (!src) {
- fprintf(stderr, "_SCI_STRDUP() [%s (%s) : %u]\n",
- __FILE__, "", __LINE__);
- fprintf(stderr, " attempt to strdup NULL pointer\n");
- BREAKPOINT();
- }
- ALLOC_MEM((res = strdup(src)), strlen(src), __FILE__, __LINE__, "")
-
- return (char*)res;
-}
-
-char *sci_strndup(const char *src, size_t length) {
- void *res;
- char *strres;
- size_t rlen = (int)MIN(strlen(src), length) + 1;
-
- if (!src) {
- fprintf(stderr, "_SCI_STRNDUP() [%s (%s) : %u]\n",
- __FILE__, "", __LINE__);
- fprintf(stderr, " attempt to strndup NULL pointer\n");
- BREAKPOINT();
- }
- ALLOC_MEM((res = malloc(rlen)), rlen, __FILE__, __LINE__, "")
-
- strres = (char *)res;
- strncpy(strres, src, rlen);
- strres[rlen - 1] = 0;
-
- return strres;
-}
-
-//-------- Refcounting ----------
-
-#define REFCOUNT_OVERHEAD (sizeof(uint32) * 3)
-#define REFCOUNT_MAGIC_LIVE_1 0xebdc1741
-#define REFCOUNT_MAGIC_LIVE_2 0x17015ac9
-#define REFCOUNT_MAGIC_DEAD_1 0x11dead11
-#define REFCOUNT_MAGIC_DEAD_2 0x22dead22
-
-#define REFCOUNT_CHECK(p) ((((uint32 *)(p))[-3] == REFCOUNT_MAGIC_LIVE_2) && (((uint32 *)(p))[-1] == REFCOUNT_MAGIC_LIVE_1))
-
-#define REFCOUNT(p) (((uint32 *)p)[-2])
-
-#undef TRACE_REFCOUNT
-
-extern void *sci_refcount_alloc(size_t length) {
- uint32 *data = (uint32 *)sci_malloc(REFCOUNT_OVERHEAD + length);
-#ifdef TRACE_REFCOUNT
- fprintf(stderr, "[] REF: Real-alloc at %p\n", data);
-#endif
- data += 3;
-
- data[-1] = REFCOUNT_MAGIC_LIVE_1;
- data[-3] = REFCOUNT_MAGIC_LIVE_2;
- REFCOUNT(data) = 1;
-#ifdef TRACE_REFCOUNT
- fprintf(stderr, "[] REF: Alloc'd %p (ref=%d) OK=%d\n", data, REFCOUNT(data),
- REFCOUNT_CHECK(data));
-#endif
- return data;
-}
-
-extern void *sci_refcount_incref(void *data) {
- if (!REFCOUNT_CHECK(data)) {
- BREAKPOINT();
- } else
- REFCOUNT(data)++;
-
-#ifdef TRACE_REFCOUNT
- fprintf(stderr, "[] REF: Inc'ing %p (now ref=%d)\n", data, REFCOUNT(data));
-#endif
- return data;
-}
-
-extern void sci_refcount_decref(void *data) {
-#ifdef TRACE_REFCOUNT
- fprintf(stderr, "[] REF: Dec'ing %p (prev ref=%d) OK=%d\n", data, REFCOUNT(data),
- REFCOUNT_CHECK(data));
-#endif
- if (!REFCOUNT_CHECK(data)) {
- BREAKPOINT();
- } else if (--REFCOUNT(data) == 0) {
- uint32 *fdata = (uint32 *)data;
-
- fdata[-1] = REFCOUNT_MAGIC_DEAD_1;
- fdata[-3] = REFCOUNT_MAGIC_DEAD_2;
-
-#ifdef TRACE_REFCOUNT
- fprintf(stderr, "[] REF: Freeing (%p)...\n", fdata - 3);
-#endif
- free(fdata - 3);
-#ifdef TRACE_REFCOUNT
- fprintf(stderr, "[] REF: Done.\n");
-#endif
- }
-}
-
-extern void *sci_refcount_memdup(void *data, size_t len) {
- void *dest = sci_refcount_alloc(len);
- memcpy(dest, data, len);
- return dest;
-}
-
-} // End of namespace Sci
Modified: scummvm/trunk/engines/sci/scicore/sciconsole.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/sciconsole.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/scicore/sciconsole.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -26,7 +26,7 @@
/* First part of the console implmentation: VM independent stuff */
/* Remember, it doesn't have to be fast. */
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#include "sci/include/engine.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/sfx/iterator.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/iterator.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/sfx/iterator.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -30,7 +30,7 @@
#include "sci/sfx/sfx_iterator_internal.h"
#include "sci/sfx/sfx_player.h"
#include "sci/tools.h"
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/sfx/mixer/soft.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/mixer/soft.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/sfx/mixer/soft.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -27,7 +27,7 @@
#include "sci/tools.h"
#include "sci/sfx/mixer.h"
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/sfx/pcm-iterator.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/pcm-iterator.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/sfx/pcm-iterator.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -25,7 +25,7 @@
#include "sci/sfx/sfx_iterator.h"
#include "sci/tools.h" /* for BREAKPOINT */
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
namespace Sci {
Modified: scummvm/trunk/engines/sci/sfx/seq/instrument-map.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/seq/instrument-map.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/sfx/seq/instrument-map.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -25,7 +25,7 @@
#include "common/scummsys.h"
#include "sci/include/sci_midi.h"
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#include "sci/sfx/seq/instrument-map.h"
#include "sci/sfx/sfx_engine.h"
Modified: scummvm/trunk/engines/sci/sfx/softseq/amiga.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/softseq/amiga.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/sfx/softseq/amiga.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -24,7 +24,7 @@
*/
#include "sci/tools.h"
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
#include "sci/sfx/softseq.h"
#include "common/file.h"
Modified: scummvm/trunk/engines/sci/sfx/songlib.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/songlib.cpp 2009-02-24 05:30:45 UTC (rev 38831)
+++ scummvm/trunk/engines/sci/sfx/songlib.cpp 2009-02-24 05:39:10 UTC (rev 38832)
@@ -25,7 +25,7 @@
#include <stdio.h>
#include "sci/sfx/sfx_engine.h"
-#include "sci/include/sci_memory.h"
+#include "sci/sci_memory.h"
namespace Sci {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list