| 1 | diff -rud ./include/cdparanoia/paranoia/p_block.h cdparanoia-0.9.8-new/include/cdparanoia/paranoia/p_block.h |
|---|
| 2 | --- ./include/cdparanoia/paranoia/p_block.h Mon Oct 20 13:31:35 2003 |
|---|
| 3 | +++ cdparanoia-0.9.8-new/include/cdparanoia/paranoia/p_block.h Tue Nov 25 17:14:34 2003 |
|---|
| 4 | @@ -128,7 +128,7 @@ |
|---|
| 5 | |
|---|
| 6 | } offsets; |
|---|
| 7 | |
|---|
| 8 | -typedef struct cdrom_paranoia{ |
|---|
| 9 | +struct cdrom_paranoia { |
|---|
| 10 | cdrom_drive *d; |
|---|
| 11 | |
|---|
| 12 | root_block root; /* verified/reconstructed cached data */ |
|---|
| 13 | @@ -155,7 +155,7 @@ |
|---|
| 14 | |
|---|
| 15 | /* statistics for verification */ |
|---|
| 16 | |
|---|
| 17 | -} cdrom_paranoia; |
|---|
| 18 | +}; |
|---|
| 19 | |
|---|
| 20 | extern c_block *c_alloc(int16_t *vector,long begin,long size); |
|---|
| 21 | extern void c_set(c_block *v,long begin); |
|---|
| 22 | @@ -171,8 +171,8 @@ |
|---|
| 23 | |
|---|
| 24 | /* pos here is vector position from zero */ |
|---|
| 25 | |
|---|
| 26 | -extern void recover_cache(cdrom_paranoia *p); |
|---|
| 27 | -extern void i_paranoia_firstlast(cdrom_paranoia *p); |
|---|
| 28 | +extern void recover_cache(struct cdrom_paranoia *p); |
|---|
| 29 | +extern void i_paranoia_firstlast(struct cdrom_paranoia *p); |
|---|
| 30 | |
|---|
| 31 | #define cv(c) (c->vector) |
|---|
| 32 | |
|---|
| 33 | Only in ./include: config.h |
|---|
| 34 | diff -rud ./interface/osx_interface.c cdparanoia-0.9.8-new/interface/osx_interface.c |
|---|
| 35 | --- ./interface/osx_interface.c Mon Oct 20 14:10:43 2003 |
|---|
| 36 | +++ cdparanoia-0.9.8-new/interface/osx_interface.c Tue Nov 25 17:12:13 2003 |
|---|
| 37 | @@ -26,7 +26,7 @@ |
|---|
| 38 | CFTypeRef str_bsd_path; |
|---|
| 39 | char *result; |
|---|
| 40 | |
|---|
| 41 | - str_bsd_path = IORegistryEntryCreateCFProperty(media, CFSTR(kIOBSDName), kCFAllocatorDefault, 0); |
|---|
| 42 | + str_bsd_path = IORegistryEntryCreateCFProperty(media, CFSTR(kIOBSDNameKey), kCFAllocatorDefault, 0); |
|---|
| 43 | |
|---|
| 44 | if(str_bsd_path == NULL) { |
|---|
| 45 | return NULL; |
|---|
| 46 | @@ -70,7 +70,7 @@ |
|---|
| 47 | return -1; |
|---|
| 48 | } |
|---|
| 49 | |
|---|
| 50 | - CFDictionarySetValue(classes_to_match, CFSTR(kIOMediaEjectable), kCFBooleanTrue); |
|---|
| 51 | + CFDictionarySetValue(classes_to_match, CFSTR(kIOMediaEjectableKey), kCFBooleanTrue); |
|---|
| 52 | |
|---|
| 53 | kern_result = IOServiceGetMatchingServices(port, classes_to_match, &media_iterator); |
|---|
| 54 | if (kern_result != KERN_SUCCESS) { |
|---|
