* Applied Alex' sci_memory patches

* Added configure option to select his memory allocation modes
* Added Alex to the "About FreeSCI" boxes

Here's his changelog:


2001-08-15  Alex Angas  <[email protected]>

	* src/scicore/sci_memory.c, src/include/sci_memory.h: Library for safe
	allocation of memory and accurate reporting of where calls fail.
	Includes: sci_malloc(), sci_calloc(), sci_realloc(), sci_free(),
	sci_memdup(), sci_strdup(), sci_strndup().

	* src/scicore/tools.c, src/gfx/gfx_test.c, src/scicore/console.c,
	src/include/resource.h, src/scicore/resource.c,	src/include/menubar.h:
	Generally removed various parts and merged into the sci_memory library.

	* src/gfx/menubar.c, src/engine/cfsml.pl, src/engine/savegame.cfsml,
	src/include/console.h, src/gfx/menubar.c, src/sound/sfx_save.cfsml,
	src/sound/sound.c, src/include/sound.h, src/sound/soundserver_sdl.c,
	src/sound/soundserver_unix.c, src/sound/tools.c:
	Removed	redundant code, merged some parts into sci_memory. These files
	were changed to use the sci_memory library.

	* src/scicore/Makefile.am: Now compiling sci_memory.c.

	* src/win32/fsci_dll.dsp, src/win32/sciv.dsp: Now compiling
	sci_memory.c.

	* ./acinclude.m4, ./aclocal.m4: Corrected Web address for dmalloc
	library.

	* src/include/kernel.h (get_nsrect), src/include/sound.h: Fixed Win32
	linkage problem.

	* ./portable_howto.txt: Added message about not using #warning.


Sorry for taking so long to merge this patch!


-- Christoph

AUTHORS

@@ -223,4 +223,9 @@ conf/
 
 
 Alexander R. Angas: <[email protected]>
-Win32 optimizations and updates in many files
+Win32 optimizations and updates in many files
+memory function intermediate layer
+scicore/
+	sci_memory.c
+include/
+	sci_memory.h

ChangeLog

@@ -1,3 +1,38 @@
+2001-08-18  Christoph Reichenbach  <[email protected]>
+
+	* configure.in: Added --with-alloc option to set SCI_ALLOC
+
+2001-08-15  Alex Angas  <[email protected]>
+
+	* src/scicore/sci_memory.c, src/include/sci_memory.h: Library for safe
+	allocation of memory and accurate reporting of where calls fail.
+	Includes: sci_malloc(), sci_calloc(), sci_realloc(), sci_free(),
+	sci_memdup(), sci_strdup(), sci_strndup().
+
+	* src/scicore/tools.c, src/gfx/gfx_test.c, src/scicore/console.c,
+	src/include/resource.h, src/scicore/resource.c,	src/include/menubar.h:
+	Generally removed various parts and merged into the sci_memory library.
+
+	* src/gfx/menubar.c, src/engine/cfsml.pl, src/engine/savegame.cfsml,
+	src/include/console.h, src/gfx/menubar.c, src/sound/sfx_save.cfsml,
+	src/sound/sound.c, src/include/sound.h, src/sound/soundserver_sdl.c,
+	src/sound/soundserver_unix.c, src/sound/tools.c:
+	Removed	redundant code, merged some parts into sci_memory. These files
+	were changed to use the sci_memory library.
+
+	* src/scicore/Makefile.am: Now compiling sci_memory.c.
+
+	* src/win32/fsci_dll.dsp, src/win32/sciv.dsp: Now compiling
+	sci_memory.c.
+
+	* ./acinclude.m4, ./aclocal.m4: Corrected Web address for dmalloc
+	library.
+
+	* src/include/kernel.h (get_nsrect), src/include/sound.h: Fixed Win32
+	linkage problem.
+
+	* ./portable_howto.txt: Added message about not using #warning.
+
 2001-08-13  Christoph Reichenbach  <[email protected]>
 
 	* src/gfx/drivers/xlib_driver.c (xlib_init): Added listing of

acconfig.h

@@ -9,3 +9,4 @@
 #undef HAVE_MITSHM
 #undef HAVE_SDL
 #undef HAVE_DLOPEN
+#undef SCI_ALLOC

acinclude.m4

@@ -760,8 +760,8 @@ int main (int argc, char *argv[])
 AC_DEFUN(AM_WITH_DMALLOC,
 [AC_MSG_CHECKING(if malloc debugging is wanted)
 AC_ARG_WITH(dmalloc,
-[  --with-dmalloc          use dmalloc, as in
-                          ftp://ftp.letters.com/src/dmalloc/dmalloc.tar.gz],
+[  --with-dmalloc          use dmalloc, available at
+                          http://dmalloc.com],
 [if test "$withval" = yes; then
   AC_MSG_RESULT(yes)
   AC_DEFINE(WITH_DMALLOC,1,

aclocal.m4

@@ -721,8 +721,8 @@ int main (int argc, char *argv[])
 AC_DEFUN(AM_WITH_DMALLOC,
 [AC_MSG_CHECKING(if malloc debugging is wanted)
 AC_ARG_WITH(dmalloc,
-[  --with-dmalloc          use dmalloc, as in
-                          ftp://ftp.letters.com/src/dmalloc/dmalloc.tar.gz],
+[  --with-dmalloc          use dmalloc, available at
+                          http://dmalloc.com],
 [if test "$withval" = yes; then
   AC_MSG_RESULT(yes)
   AC_DEFINE(WITH_DMALLOC,1,

config.h.in

@@ -24,6 +24,7 @@
 #undef HAVE_MITSHM
 #undef HAVE_SDL
 #undef HAVE_DLOPEN
+#undef SCI_ALLOC
 
 /* The number of bytes in a int.  */
 #undef SIZEOF_INT