--- psiconv/trunk/program/psiconv/magick-aux.h	2000/12/10 16:49:40	58
+++ psiconv/trunk/program/psiconv/magick-aux.h	2005/02/25 20:36:25	255
@@ -1,6 +1,6 @@
 /*
     magick-aux.h - 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
@@ -21,8 +21,19 @@
 
 #if IMAGEMAGICK
 
+#if IMAGEMAGICK_API == 1
+
 #include <magick/magick.h>
 
-extern MagickInfo * GetMagickFileList(void);
+#else
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <magick/api.h>
+
+#endif /* IMAGEMAGICK_OLD */
+
+extern const MagickInfo * GetMagickFileList(void);
 
 #endif /* IMAGEMAGICK */