--- psiconv/trunk/program/psiconv/magick-aux.c	2001/06/30 13:36:39	118
+++ psiconv/trunk/program/psiconv/magick-aux.c	2004/02/04 12:19:09	196
@@ -1,6 +1,6 @@
 /*
     magick-aux.c - Part of psiconv, a PSION 5 file formats converter
-    Copyright (c) 2000  Frodo Looijaard <frodol@dds.nl>
+    Copyright (c) 2000-2004  Frodo Looijaard <frodol@dds.nl>
 
     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
@@ -22,12 +22,18 @@
 #if 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);