--- ./cdda2wav/cdda2wav.c.org 2004-08-25 00:06:14.000000000 +0900 +++ ./cdda2wav/cdda2wav.c 2005-08-24 06:13:28.000000000 +0900 @@ -124,6 +124,10 @@ #endif #include "defaults.h" +#if defined(__APPLE__) && defined(__MACH__) +#undef _POSIX_PRIORITY_SCHEDULING +#endif + int main __PR((int argc, char **argv)); static void RestrictPlaybackRate __PR((long newrate)); static void output_indices __PR((FILE *fp, index_list *p, unsigned trackstart)); --- ./cdrecord/cdrecord.c.org 2005-08-24 05:09:56.000000000 +0900 +++ ./cdrecord/cdrecord.c 2005-08-24 06:12:40.000000000 +0900 @@ -72,6 +72,10 @@ #endif #endif +#if defined(__APPLE__) && defined(__MACH__) +#undef _POSIX_PRIORITY_SCHEDULING +#endif + #if WORDS_BIGENDIAN /* on-the-fly encryption */ # define xcpu_to_le32(x) ({u_int32_t __x=(x);((u_int32_t)((((u_int32_t)(__x)&(u_int32_t)0x000000ffUL)<<24)|(((u_int32_t)(__x)&(u_int32_t)0x0000ff00UL)<<8)|(((u_int32_t)(__x)&(u_int32_t)0x00ff0000UL)>>8)|(((u_int32_t)(__x)&(u_int32_t)0xff000000UL)>>24)));}) #else @@ -195,7 +199,7 @@ u_int32_t devSect2 = 0; u_int32_t devSect3 = 0; u_int32_t iv[8]; -int encrypt = 0; +int encrypt_flag = 0; char *encpass = NULL; char *encpasshex = NULL; char *encpassfile = NULL; @@ -2273,7 +2277,7 @@ } count = get_buf(f, trackp, startsec, &bp, bytes_to_read); - if ((encrypt) && (encstyleset > 0)) { + if ((encrypt_flag) && (encstyleset > 0)) { isblockvalid = div (count,512); if (isblockvalid.rem) { comerr("cannot encrypt - incompatible blocksize ... :-( \n"); @@ -3390,7 +3394,7 @@ int reset = 0; int doabort = 0; int overburn = 0; - // int encrypt = 0; + // int encrypt_flag = 0; // char *encpass=""; int ignsize = 0; int useinfo = 0; @@ -3469,7 +3473,7 @@ */ if ((ga_ret = getargs(&cac, &cav, opts, &help, &version, &checkdrive, &prcap, - &inq, &scanbus, &reset, &doabort, &overburn, &encrypt, encpassp, encpasshexp, encpassfilep, encstylep, &ignsize, + &inq, &scanbus, &reset, &doabort, &overburn, &encrypt_flag, encpassp, encpasshexp, encpassfilep, encstylep, &ignsize, &useinfo, devp, timeoutp, &driver, &driveropts, &setdropts, getllnum, &tracksize, @@ -3524,7 +3528,7 @@ *flagsp |= F_ABORT; if (overburn) *flagsp |= F_OVERBURN; - if (encrypt) + if (encrypt_flag) *flagsp |= F_ENCRYPT; if (ignsize) *flagsp |= F_IGNSIZE; @@ -4085,7 +4089,7 @@ // 2 -> old / compatible style, aes-256-cbc, plain "hash", plain IV (linux >2.4.22 cryptoloop compatible) // check for encryption parameters - if (encrypt) { + if (encrypt_flag) { // if no encstyle specified, use default, otherwise select if (!*encstylep) encstyleset = 1; else { --- ./cdrecord/drv_mmc.c.org 2005-08-24 05:08:29.000000000 +0900 +++ ./cdrecord/drv_mmc.c 2005-08-24 06:18:38.000000000 +0900 @@ -1109,7 +1109,7 @@ return (0); } -LOCAL int +EXPORT int check_writemodes_mdvd(scgp, dp) SCSI *scgp; cdr_t *dp;