--- lib/dpx/dpx_raw.hh.orig Fri Sep 11 13:13:47 2015 +++ lib/dpx/dpx_raw.hh Fri Sep 11 13:17:18 2015 @@ -55,6 +55,16 @@ #if !defined(CTL_DPX_RAW_INTERNAL_INCLUDE) #define CRL_DPX_RAW_INTERNAL_INCLUDE +#ifdef swap64 +#undef swap64 +#endif +#ifdef swap32 +#undef swap32 +#endif +#ifdef swap16 +#undef swap16 +#endif + namespace ctl { namespace dpxi {