--- ray/src/common/standard.h	2003/06/05 19:29:34	2.23
+++ ray/src/common/standard.h	2003/06/07 12:50:20	2.25
@@ -1,10 +1,12 @@
-/* RCSid $Id: standard.h,v 2.23 2003/06/05 19:29:34 schorsch Exp $ */
+/* RCSid $Id: standard.h,v 2.25 2003/06/07 12:50:20 schorsch Exp $ */
 /*
  *	Miscellaneous definitions required by many routines.
  */
-
 #ifndef _RAD_STANDARD_H_
 #define _RAD_STANDARD_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #include "copyright.h"
 
@@ -19,6 +21,11 @@
 #include  "platform.h"
 #include  "mat4.h"
 
+
+#ifndef NULL
+#define NULL 0
+#endif
+
 				/* regular transformation */
 typedef struct {
 	MAT4  xfm;				/* transform matrix */
@@ -203,4 +210,8 @@ extern void	wputs(char *s);
 extern void	quit(int code);
 
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* _RAD_STANDARD_H_ */
+