--- ray/src/common/standard.h	2003/06/07 12:50:20	2.25
+++ ray/src/common/standard.h	2003/06/20 00:25:49	2.27
@@ -1,4 +1,4 @@
-/* RCSid $Id: standard.h,v 2.25 2003/06/07 12:50:20 schorsch Exp $ */
+/* RCSid $Id: standard.h,v 2.27 2003/06/20 00:25:49 greg Exp $ */
 /*
  *	Miscellaneous definitions required by many routines.
  */
@@ -18,14 +18,10 @@ extern "C" {
 #include  <stdlib.h>
 #include  <string.h>
 
-#include  "platform.h"
+#include  "tifftypes.h"
+
 #include  "mat4.h"
 
-
-#ifndef NULL
-#define NULL 0
-#endif
-
 				/* regular transformation */
 typedef struct {
 	MAT4  xfm;				/* transform matrix */
@@ -45,6 +41,7 @@ typedef struct {
 #endif
 #endif
 
+/* XXX include paths.h instead */
 #ifndef	 F_OK			/* mode bits for access(2) call */
 #define	 R_OK		4		/* readable */
 #define	 W_OK		2		/* writable */
@@ -52,13 +49,6 @@ typedef struct {
 #define	 F_OK		0		/* exists */
 #endif
 
-#ifndef  int2
-#define  int2		short		/* two-byte integer */
-#endif
-#ifndef  int4
-#define  int4		int		/* four-byte integer */
-#endif
-
 				/* error codes */
 #define	 WARNING	0		/* non-fatal error */
 #define	 USER		1		/* fatal user-caused error */
@@ -115,7 +105,7 @@ extern double	tcos();			/* table-based cosine approxim
 #endif
 extern off_t  lseek();
 
-#ifdef MSDOS
+#ifdef _WIN32
 #define NIX 1
 #endif
 #ifdef AMIGA
@@ -200,10 +190,14 @@ extern int	fullxf(FULLXF *fx, int ac, char *av[]);
 					/* defined in zeroes.c */
 extern int	quadtratic(double *r, double a, double b, double c);
 					/* defined in dircode.c */
-extern int4	encodedir(FVECT dv);
-extern void	decodedir(FVECT dv, int4 dc);
-extern double	dir2diff(int4 dc1, int4 dc2);
-extern double	fdir2diff(int4 dc1, FVECT v2);
+extern int32	encodedir(FVECT dv);
+extern void	decodedir(FVECT dv, int32 dc);
+extern double	dir2diff(int32 dc1, int32 dc2);
+extern double	fdir2diff(int32 dc1, FVECT v2);
+					/* defined in lamp.c */
+extern float * matchlamp(char *s);
+extern int loadlamps(char *file);
+extern void freelamps(void);
 					/* miscellaneous */
 extern void	eputs(char *s);
 extern void	wputs(char *s);