diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/cdreader.h | 3 | ||||
| -rw-r--r-- | includes/cdutils.h | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/includes/cdreader.h b/includes/cdreader.h index acf6765..6e952bb 100644 --- a/includes/cdreader.h +++ b/includes/cdreader.h @@ -28,9 +28,6 @@ class cdreader : public Handle { private: String n; int sector; -#if defined (_MSC_VER) || defined (__MINGW32__) - HANDLE hF; -#endif }; #endif diff --git a/includes/cdutils.h b/includes/cdutils.h index e389efd..12746dd 100644 --- a/includes/cdutils.h +++ b/includes/cdutils.h @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: cdutils.h,v 1.10 2003-11-23 14:43:06 pixel Exp $ */ +/* $Id: cdutils.h,v 1.11 2003-11-25 01:55:45 pixel Exp $ */ #ifndef __CDUTILS_H__ #define __CDUTILS_H__ @@ -39,7 +39,7 @@ extern const long sec_sizes[]; extern const long sec_offsts[]; extern const String sec_modes[]; -#ifdef _WIN32 +#ifdef _MSC_VER #pragma pack(1) #endif @@ -68,7 +68,7 @@ class cdutils : public Base { unsigned short VolSeq; unsigned short BEVolSeq; unsigned char N; - char id; + char id[1]; } PACKED; @@ -100,7 +100,7 @@ class cdutils : public Base { struct DirEntry * find_dir_entry(Byte ** buffer, struct DirEntry * dir, String name); unsigned char from_BCD(unsigned char x); unsigned char to_BCD(unsigned char x); - int is_valid_BCD(unsigned char x); + bool is_valid_BCD(unsigned char x); unsigned long from_MSF(unsigned long msf, unsigned long start = 150); unsigned long from_MSF(unsigned char m, unsigned char s, unsigned char f, unsigned long start = 150); private: |