Workiiiiiiiiiiiiiiiiiing!!!!

4 files changed, 14 insertions, 5 deletions

diff --git a/includes/String.h b/includes/String.h
index 7b5fdc4..af97d2b 100644
--- a/includes/String.h
+++ b/includes/String.h
@@ -9,7 +9,10 @@
 class String : public Base {
   public:
       String(const String &);
+      String(const char * = "");
+#if 0
       String(const char * = "", ...);
+#endif
       String(char);
       String(int);
       String(unsigned int);
diff --git a/includes/cdutils.h b/includes/cdutils.h
index fa44ca6..e3cf8fb 100644
--- a/includes/cdutils.h
+++ b/includes/cdutils.h
@@ -56,14 +56,15 @@ extern long sec_sizes[];
 extern long sec_offsts[];
 extern String sec_modes[];
 
-Handle * open_ppf(String ppf, Handle * iso, char * comment);
+Handle * open_ppf(String ppf, Handle * iso, String comment) throw(GeneralException);
+void close_ppf() throw(GeneralException);
 unsigned short int swap_word(unsigned short int i);
 unsigned long int swap_dword(unsigned long int i);
 int guess_type(Handle * f_iso, int number);
 void sector_seek(Handle * f_iso, long sector);
 long read_sector(Handle * f_iso, Byte * buffer, int type, int number = -1);
 void read_datas(Handle * f_iso, Byte * buffer, int type, int number, long size);
-void read_Handle(Handle * f_iso, Handle * Handle, int type, int number, long size);
+void read_file(Handle * f_iso, Handle * Handle, int type, int number, long size);
 void write_sector(Handle * f_iso_r, Handle * f_iso_w, Byte * buffer, int type, int number = -1);
 void write_datas(Handle * f_iso_r, Handle * f_iso_w, Byte * buffer, int type, int number, long size);
 void write_file(Handle * f_iso_r, Handle * f_iso_w, Handle * Handle, int type, int number = -1);
diff --git a/includes/dte.h b/includes/dte.h
index 267e9ed..3be7f9c 100644
--- a/includes/dte.h
+++ b/includes/dte.h
@@ -4,10 +4,10 @@
 void dte_reset(void);
 void build_dte(void);
 void push_entry(long entry);
-char * read_line(FILE * f, char * b);
+char * read_line(Handle * f, char * b);
 void dte_compress();
-void read_thingy(FILE * f);
-void read_thingy_file(FILE * f);
+void read_thingy(Handle * f);
+void read_thingy_file(Handle * f);
 
 extern char * dte_text;
 extern char * things[256];
diff --git a/includes/generic.h b/includes/generic.h
index 9c5b7a4..5586953 100644
--- a/includes/generic.h
+++ b/includes/generic.h
@@ -33,8 +33,13 @@
 #define bcopy(x,y,z) memcpy((y),(x),(z))
 #endif
 
+#ifndef MAX
 #define MIN(a,b) ((a)<(b)?(a):(b))
+#endif
+
+#ifndef MAX
 #define MAX(a,b) ((a)<(b)?(b):(a)
+#endif
 
 #ifndef SDL_VERSIONNUM
 typedef unsigned long int Uint32;