--- ray/src/common/bsdf.h 2011/06/08 15:37:46 2.14 +++ ray/src/common/bsdf.h 2011/08/21 22:38:12 2.16 @@ -1,4 +1,4 @@ -/* RCSid $Id: bsdf.h,v 2.14 2011/06/08 15:37:46 greg Exp $ */ +/* RCSid $Id: bsdf.h,v 2.16 2011/08/21 22:38:12 greg Exp $ */ /* * bsdf.h * @@ -30,6 +30,10 @@ extern "C" { #endif +#ifdef _WIN32 +#define strcasecmp stricmp +#endif + #define SDnameLn 128 /* maximum BSDF name length */ #define SDmaxCh 3 /* maximum # spectral channels */ @@ -67,10 +71,10 @@ typedef struct { } SDValue; /* Cached, encoded, cumulative distribution for one incident (solid) angle */ -#define SD_CDIST_BASE double cTotal; \ - struct SDCDst_s *next +#define SD_CDIST_BASE(styp) double cTotal; \ + struct styp *next typedef struct SDCDst_s { - SD_CDIST_BASE; /* base fields first */ + SD_CDIST_BASE(SDCDst_s); /* base fields first */ /* ...encoded distribution extends struct */ } SDCDst;