--- ray/src/common/tmprivat.h	2003/07/14 04:56:54	3.11
+++ ray/src/common/tmprivat.h	2003/07/17 09:21:29	3.13
@@ -1,12 +1,9 @@
-/* RCSid $Id: tmprivat.h,v 3.11 2003/07/14 04:56:54 greg Exp $ */
+/* RCSid $Id: tmprivat.h,v 3.13 2003/07/17 09:21:29 schorsch Exp $ */
 /*
  * Private header file for tone mapping routines.
  */
 #ifndef _RAD_TMPRIVAT_H_
 #define _RAD_TMPRIVAT_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 #ifndef	MEM_PTR
 #define	MEM_PTR		void *
@@ -14,6 +11,10 @@ extern "C" {
 #include	"color.h"
 #include	"tonemap.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 				/* required constants */
 #ifndef M_LN2
 #define M_LN2		0.69314718055994530942
@@ -58,12 +59,12 @@ extern "C" {
 MEM_PTR		malloc();
 MEM_PTR		calloc();
 #endif
-extern int	tmErrorReturn();
+extern int	tmErrorReturn(char*, int);
 
 						/* lookup for mesopic scaling */
 extern BYTE	tmMesofact[BMESUPPER-BMESLOWER];
 
-extern void	tmMkMesofact();			/* build tmMesofact */
+extern void	tmMkMesofact(void);			/* build tmMesofact */
 
 #define	returnErr(code)	return(tmErrorReturn(funcName,code))
 #define returnOK	return(TM_E_OK)