ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/common/tmprivat.h
(Generate patch)

Comparing ray/src/common/tmprivat.h (file contents):
Revision 3.11 by greg, Mon Jul 14 04:56:54 2003 UTC vs.
Revision 3.13 by schorsch, Thu Jul 17 09:21:29 2003 UTC

# Line 4 | Line 4
4   */
5   #ifndef _RAD_TMPRIVAT_H_
6   #define _RAD_TMPRIVAT_H_
7 – #ifdef __cplusplus
8 – extern "C" {
9 – #endif
7  
8   #ifndef MEM_PTR
9   #define MEM_PTR         void *
# Line 14 | Line 11 | extern "C" {
11   #include        "color.h"
12   #include        "tonemap.h"
13  
14 + #ifdef __cplusplus
15 + extern "C" {
16 + #endif
17 +
18                                  /* required constants */
19   #ifndef M_LN2
20   #define M_LN2           0.69314718055994530942
# Line 58 | Line 59 | extern "C" {
59   MEM_PTR         malloc();
60   MEM_PTR         calloc();
61   #endif
62 < extern int      tmErrorReturn();
62 > extern int      tmErrorReturn(char*, int);
63  
64                                                  /* lookup for mesopic scaling */
65   extern BYTE     tmMesofact[BMESUPPER-BMESLOWER];
66  
67 < extern void     tmMkMesofact();                 /* build tmMesofact */
67 > extern void     tmMkMesofact(void);                     /* build tmMesofact */
68  
69   #define returnErr(code) return(tmErrorReturn(funcName,code))
70   #define returnOK        return(TM_E_OK)

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)