*** empty log message ***

2 files changed, 44 insertions, 36 deletions

diff --git a/Programmer/iff.h b/Programmer/iff.h
index de1faf5..98e4c2c 100644
--- a/Programmer/iff.h
+++ b/Programmer/iff.h
@@ -2,18 +2,18 @@
 #define LIBRARIES_IFF_H
 /*
 **
-**	$Id: iff.h,v 21.4 92/05/23 01:34:23 chris Exp $
-**	$Revision: 21.4 $
+**	$Id: iff.h,v 22.1 92/06/02 16:46:47 chris Exp $
+**	$Revision: 22.1 $
 **
-**	$Filename: iff.h $
+**	$Filename: Libraries/iff.h $
 **	$Author: Christian A. Weber $
-**	$Release: 22.1 $
-**	$Date: 92/05/23 01:34:23 $
+**	$Release: 23.2 $
+**	$Date: 92/06/02 16:46:47 $
 **
 **	Standard header file for programs using iff.library
 **
-**	COPYRIGHT (C) 1987-1992 BY CHRISTIAN A. WEBER, BRUGGERWEG 2,
-**	CH-8037 ZUERICH, SWITZERLAND.
+**	COPYRIGHT (C) 1987-1993 BY CHRISTIAN A. WEBER, BRUGGERWEG 2,
+**	CH-8037 ZUERICH, SWITZERLAND (chris@mighty.adsp.sub.org).
 **	THIS FILE MAY BE FREELY DISTRIBUTED. USE AT YOUR OWN RISK.
 **
 */
@@ -23,7 +23,7 @@
 #endif
 
 #define IFFNAME "iff.library"
-#define IFFVERSION 22L					/* Current library version */
+#define IFFVERSION 23L					/* Current library version */
 
 /****************************************************************************
 **	Error codes (returned by IFFL_IFFError())
@@ -94,7 +94,9 @@
 
 #define ID_8SVX IFFL_MAKE_ID('8','S','V','X')
 #define ID_ATAK IFFL_MAKE_ID('A','T','A','K')
+#ifndef ID_NAME
 #define ID_NAME IFFL_MAKE_ID('N','A','M','E')
+#endif
 #define ID_RLSE IFFL_MAKE_ID('R','L','S','E')
 #define ID_VHDR IFFL_MAKE_ID('V','H','D','R')
 
@@ -124,30 +126,27 @@
 **	Structure definitions
 */
 
-#ifdef _IFFLIB
-
-typedef struct
-{
-	BPTR	File;			/* DOS file handle */
-	LONG	FormSize;		/* Größe des gesamten FORM */
-	LONG	ChunkSize;		/* Größe des aktuellen Chunks */
-	LONG	ChunkFPos;		/* Position im File wo dieser Chunk beginnt */
-} *IFFL_HANDLE;
-
-#else
-
-typedef void *IFFL_HANDLE;	/* The IFF 'FileHandle' structure */
+/*
+**	The private IFF 'FileHandle' structure
+*/
+typedef void *IFFL_HANDLE;
 
-#endif
 
-struct IFFL_Chunk			/* Generic IFF chunk structure */
+/*
+**	Generic IFF chunk structure
+*/
+struct IFFL_Chunk
 {
 	LONG  ckID;
 	LONG  ckSize;
 /*  UBYTE ckData[ckSize] (variable sized data) */
 };
 
-struct IFFL_BMHD			/* BMHD chunk for ILBM files */
+
+/*
+**	BMHD chunk (BitMapHeader) of ILBM files
+*/
+struct IFFL_BMHD
 {
 	UWORD w,h;
 	WORD  x,y;
@@ -160,7 +159,11 @@ struct IFFL_BMHD			/* BMHD chunk for ILBM files */
 	WORD  pageWidth,pageHeight;
 };
 
-struct IFFL_ANHD			/* ANHD chunk for ANIM files */
+
+/*
+**	ANHD chunk (AnimHeader) of ANIM files
+*/
+struct IFFL_ANHD
 {
 	UBYTE	Operation;
 	UBYTE	Mask;
@@ -182,8 +185,9 @@ struct IFFL_ANHD			/* ANHD chunk for ANIM files */
 #define AnimHeader IFFL_ANHD
 #endif
 
+
 /****************************************************************************
-**	IFF library function prototypes (ANSI)
+**	IFF library function prototypes (ANSI C)
 */
 
 void				 IFFL_CloseIFF        ( IFFL_HANDLE );
@@ -225,7 +229,7 @@ IFFL_HANDLE	PPOpenIFF(char *,char *);
 
 
 /****************************************************************************
-**	Pragmas for Lattice C V5.x
+**	Pragmas for SAS/C
 **	(generated with: 'fd2pragma iff_lib.fd iff_pragmas.h')
 */
 
@@ -271,5 +275,5 @@ extern struct Library *IFFBase;
 
 #endif
 
-#endif !LIBRARIES_IFF_H
+#endif
 
diff --git a/Programmer/iff.i b/Programmer/iff.i
index b909e1c..bc304a5 100644
--- a/Programmer/iff.i
+++ b/Programmer/iff.i
@@ -1,18 +1,18 @@
 		IFND	LIBRARIES_IFF_I
 LIBRARIES_IFF_I	SET	1
 **
-**	$Id: iff.i,v 21.3 92/05/23 01:34:36 chris Exp $
-**	$Revision: 21.3 $
+**	$Id: iff.i,v 22.1 92/06/02 16:46:32 chris Exp $
+**	$Revision: 22.1 $
 **
-**	$Filename: iff.i $
+**	$Filename: Libraries/iff.i $
 **	$Author: Christian A. Weber $
-**	$Release: 22.1 $
-**	$Date: 92/05/23 01:34:36 $
+**	$Release: 23.2 $
+**	$Date: 92/06/02 16:46:32 $
 **
 **	Standard header file for programs using iff.library
 **
 **	COPYRIGHT (C) 1987-1992 BY CHRISTIAN A. WEBER, BRUGGERWEG 2,
-**	CH-8037 ZUERICH, SWITZERLAND.
+**	CH-8037 ZUERICH, SWITZERLAND (chris@mighty.adsp.sub.org).
 **	THIS FILE MAY BE FREELY DISTRIBUTED. USE AT YOUR OWN RISK.
 **
 
@@ -22,7 +22,7 @@ IFFNAME		MACRO
 		dc.b	'iff.library',0
 		ENDM
 
-IFFVERSION:	EQU	22		; Current library version
+IFFVERSION:	EQU	23		; Current library version
 
 
 *****************************************************************************
@@ -88,12 +88,16 @@ ID_SHAM 	EQU	'SHAM'
 
 ID_8SVX 	EQU	'8SVX'
 ID_ATAK 	EQU	'ATAK'
+	IFND ID_NAME
 ID_NAME 	EQU	'NAME'
+	ENDC
 ID_RLSE 	EQU	'RLSE'
 ID_VHDR 	EQU	'VHDR'
 
 
-*************** LIBRARY OFFSETS ******************************************
+*****************************************************************************
+**	Library offsets (_LVOIFFL_...) are now in iff.lib.
+**	For compatibility, here are the old (pre-V21) ones:
 
 		IFD	IFFLIB_PRE21NAMES
 _LVOOpenIFF	EQU	-30	; (filename)			(A0)