--- libscg/scsi-mac-iokit.c.orig +++ libscg/scsi-mac-iokit.c @@ -55,7 +55,14 @@ #include <Carbon/Carbon.h> #include <IOKit/IOKitLib.h> #include <IOKit/IOCFPlugIn.h> -#include <IOKit/scsi-commands/SCSITaskLib.h> + +/* VERSION is used as an identifier somewhere in the Apple headers. */ +#define AVOID_COLLISION_SAVE_VERSION VERSION +#undef VERSION +#include <IOKit/scsi/SCSITaskLib.h> +#define VERSION AVOID_COLLISION_SAVE_VERSION +#undef AVOID_COLLISION_SAVE_VERSION + #include <mach/mach_error.h> struct scg_local {