diff options
| author | Filippos Karapetis | 2009-02-16 22:45:23 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-02-16 22:45:23 +0000 |
| commit | 6ec40aa9f64101c82daa621610bb9d66a85b4001 (patch) | |
| tree | 3a072176fab27dd1f642179ffa4fb068776d6a9b /engines/sci/include | |
| parent | dbb8ad9da18a4289071bec086f64b8e79f92fb19 (diff) | |
| download | scummvm-rg350-6ec40aa9f64101c82daa621610bb9d66a85b4001.tar.gz scummvm-rg350-6ec40aa9f64101c82daa621610bb9d66a85b4001.tar.bz2 scummvm-rg350-6ec40aa9f64101c82daa621610bb9d66a85b4001.zip | |
Removed unused code and defines
svn-id: r38385
Diffstat (limited to 'engines/sci/include')
| -rw-r--r-- | engines/sci/include/resource.h | 8 | ||||
| -rw-r--r-- | engines/sci/include/sci_memory.h | 32 |
2 files changed, 0 insertions, 40 deletions
diff --git a/engines/sci/include/resource.h b/engines/sci/include/resource.h index 1c632e1ae4..b64c02e4d2 100644 --- a/engines/sci/include/resource.h +++ b/engines/sci/include/resource.h @@ -55,13 +55,9 @@ /*#define _SCI_RESOURCE_DEBUG */ /*#define _SCI_DECOMPRESS_DEBUG*/ -#ifndef WITH_DMALLOC -# define SCI_SAFE_ALLOC /* Undefine for debugging */ -#endif //TODO: Remove these defines by replacing their functionality by their ScummVM counterparts #define HAVE_MEMCHR -#define HAVE_UNLINK #define HAVE_RMDIR #define HAVE_FCNTL_H #ifndef _MSC_VER @@ -352,11 +348,7 @@ It uses StrAt() to read the individual elements, so we must determine whether a string is really a string or an array. */ int is_print_str(char *str); -#ifdef HAVE_UNLINK # define sci_unlink unlink -#else /* !HAVE_UNLINK */ -# error "Please provide an int sci_unlink(const char *) for removing filesystem entries" -#endif /* !HAVE_UNLINK */ #ifdef HAVE_RMDIR # define sci_rmdir rmdir diff --git a/engines/sci/include/sci_memory.h b/engines/sci/include/sci_memory.h index 01ef88780c..ecda066627 100644 --- a/engines/sci/include/sci_memory.h +++ b/engines/sci/include/sci_memory.h @@ -38,22 +38,6 @@ ** Implementations of basic functions found here are in this file and ** $(SRCDIR)/src/scicore/sci_memory.c * - * Usage notes: - ************** - * - * Define MALLOC_DEBUG to output debug information whenever a memory - * allocation function is called. - * - * Make sure you #define it before any #includes. - * - * #define MALLOC_DEBUG - * #include <...> - * - ************** - * - * Define WITH_DMALLOC to use the dmalloc debug library, available from - * http://dmalloc.com/ - * ************** * * Sets behaviour if memory allocation call fails. @@ -95,11 +79,6 @@ /* * Called if memory allocation fails. */ -#ifdef WITH_DMALLOC -# ifdef __unix__ -# define DISABLE_SCI_MEMORY /* Use malloc() and friends */ -# endif -#endif #define PANIC_MEMORY(size, filename, linenum, funcname, more_info)\ PANIC((stderr, "Memory allocation of %lu bytes failed\n"\ " [%s (%s) : %u]\n " #more_info "\n",\ @@ -288,16 +267,6 @@ extern void * /********** macro definitions for routines **********/ -#ifdef DISABLE_SCI_MEMORY -# define sci_malloc malloc -# define sci_calloc calloc -# define sci_realloc realloc -# define sci_free free -# define sci_strdup strdup -# define sci_strndup strndup -# define sci_memdup memdup -#else - # ifdef __GNUC__ # define sci_malloc(size)\ _SCI_MALLOC(size, __FILE__, __LINE__, __PRETTY_FUNCTION__) @@ -358,7 +327,6 @@ extern void * # define sci_strndup(src, length)\ _SCI_STRNDUP(src, length, __FILE__, __LINE__, "") # endif -#endif /********** other memory/debug related routines **********/ |