--- ray/src/common/resolu.h	2003/06/06 16:38:47	2.5
+++ ray/src/common/resolu.h	2005/02/01 01:28:16	2.10
@@ -1,8 +1,8 @@
-/* RCSid $Id: resolu.h,v 2.5 2003/06/06 16:38:47 schorsch Exp $ */
+/* RCSid $Id: resolu.h,v 2.10 2005/02/01 01:28:16 greg Exp $ */
 /*
  * Definitions for resolution line in image file.
  *
- * Include after <stdio.h>, <string.h>, and <time.h>
+ * Include after <stdio.h>
  *
  * True image orientation is defined by an xy coordinate system
  * whose origin is at the lower left corner of the image, with
@@ -15,12 +15,14 @@
  */
 #ifndef _RAD_RESOLU_H_
 #define _RAD_RESOLU_H_
+
+#include <time.h>
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "copyright.h"
-
 			/* flags for scanline ordering */
 #define  XDECR			1
 #define  YDECR			2
@@ -70,10 +72,10 @@ extern void	printargs(int ac, char **av, FILE *fp);
 extern int	isformat(char *s);
 extern int	formatval(char *r, char *s);
 extern void	fputformat(char *s, FILE *fp);
-extern int	getheader(FILE *fp, int (*f)(), char *p);
+typedef int gethfunc(char *s, void *p); /* callback to process header lines */
+extern int	getheader(FILE *fp, gethfunc *f, void *p);
 extern int	globmatch(char *pat, char *str);
 extern int	checkheader(FILE *fin, char *fmt, FILE *fout);
-
 
 #ifdef __cplusplus
 }