--- psiconv/trunk/program/psiconv/magick-aux.c	2001/06/30 13:36:39	118
+++ psiconv/trunk/program/psiconv/magick-aux.c	2002/01/29 18:38:38	142
@@ -19,15 +19,23 @@
 
 #include "config.h"
 
-#if IMAGEMAGICK
+#ifdef IMAGEMAGICK
 
 #include "magick-aux.h"
 #include <magick/magick.h>
 #include <magick/config.h>
 
+#endif
+
+#ifdef DMALLOC
+#include "dmalloc.h"
+#endif
+
+#if IMAGEMAGICK
+
 /* This used to be very ugly, but nowadays it is much better */
 
-MagickInfo * GetMagickFileList(void)
+const MagickInfo * GetMagickFileList(void)
 {
   ExceptionInfo exc;
   GetExceptionInfo(&exc);