Rearrange the code to avoid a warning from the Watcom compiler.

[cc65] / src / sp65 / input.h

diff --git a/src/sp65/input.h b/src/sp65/input.h
index 0b019f72481ec4303cfa8a2b0939bc784d2a39bd..cfbc6f63c40073504532e4cc631cdcf1a62dbd18 100644 (file)
--- a/src/sp65/input.h
+++ b/src/sp65/input.h
@@ -38,37 +38,24 @@
 
 
 
+/* common */
+#include "coll.h"
+
 /* sp65 */
 #include "bitmap.h"
 
 
 
-/*****************************************************************************/
-/*                                   Data                                    */
-/*****************************************************************************/
-
-
-
-typedef enum InputFormat InputFormat;
-enum InputFormat {
-    ifAuto      = -1,           /* Auto detect */
-    ifPCX,                      /* PCX */
-
-    ifCount                     /* Number of actual input formats w/o ifAuto*/
-};
-
-
-
-
 /*****************************************************************************/
 /*                                   Code                                    */
 /*****************************************************************************/
 
 
 
-Bitmap* ReadInputFile (const char* Name, InputFormat Format);
-/* Read a bitmap from a file and return it. If Format is ifAuto, the routine
- * tries to determine the format from the file name extension.
+Bitmap* ReadInputFile (const Collection* A);
+/* Read a bitmap from a file and return it. Format, file name etc. must be
+ * given as attributes in A. If no format is given, the function tries to
+ * autodetect it by using the extension of the file name.
  */