Compiling again

3 files changed, 66 insertions, 8 deletions

diff --git a/includes/cdreader.h b/includes/cdreader.h
index 2dd76ca..8ebe362 100644
--- a/includes/cdreader.h
+++ b/includes/cdreader.h
@@ -4,7 +4,7 @@
 
 #include <sys/types.h>
 #include <time.h>
-#include <String.h>
+#include <BString.h>
 #include <Handle.h>
 
 class cdreader : public Handle {
diff --git a/includes/gettext.h b/includes/gettext.h
new file mode 100644
index 0000000..c37de7f
--- /dev/null
+++ b/includes/gettext.h
@@ -0,0 +1,58 @@
+#ifndef __GETTEXT_H__
+#define __GETTEXT_H__
+
+#ifndef gettext
+# define gettext(Msgid) ((const char *) (Msgid))
+#endif
+
+#ifndef dgettext
+# define dgettext(Domainname, Msgid) ((const char *) (Msgid))
+#endif
+
+#ifndef dcgettext
+# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
+#endif
+
+#ifndef ngettext
+# define ngettext(Msgid1, Msgid2, N) \
+    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+#endif
+
+#ifndef dngettext
+# define dngettext(Domainname, Msgid1, Msgid2, N) \
+    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+#endif
+
+#ifndef dcngettext
+# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
+    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+#endif
+
+#ifndef textdomain
+# define textdomain(Domainname) ((const char *) (Domainname))
+#endif
+
+#ifndef bindtextdomain
+# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
+#endif
+
+#ifndef bind_text_domain_codeset
+# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset))
+#endif
+
+#ifndef setlocale
+# define setlocale(category, locale)
+#endif
+
+#ifndef LC_ALL
+# define LC_ALL 0
+#endif
+
+#ifndef gettext_noop
+# define gettext_noop(String) String
+#endif
+
+#define _(Text) dgettext ("bleh", Text)
+#define N_(Text) Text
+
+#endif
diff --git a/includes/lzss.h b/includes/lzss.h
index 37d3ed6..14aa345 100644
--- a/includes/lzss.h
+++ b/includes/lzss.h
@@ -13,7 +13,7 @@
  *  GNU General Public License for more details. 
  * 
  *  You should have received a copy of the GNU General Public License 
- *  along with this program; if not, write to the Free Software 
+ *  aint with this program; if not, write to the Free Software 
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
 
@@ -57,10 +57,10 @@ class lzss : public Base {
 
     static const scheme_t schemes[];
     int tolerate, blockb;
-    long blk, bitmap_count;
+    int blk, bitmap_count;
 
-    unsigned long lzss_decomp(Handle * f_source, Handle * f_cible, long true_length = -1);
-    void lzss_comp(Handle * f_source, Handle * f_cible, long * delta = NULL);
+    unsigned int lzss_decomp(Handle * f_source, Handle * f_cible, int true_length = -1);
+    void lzss_comp(Handle * f_source, Handle * f_cible, int * delta = NULL);
 
     Byte swap_bits(Byte);
     
@@ -73,9 +73,9 @@ class lzss : public Base {
     
     unsigned int shift(unsigned int, int);
     void compute_limits(void);
-    unsigned char lzss_rd(unsigned char *, long);
-    long lzss_comp_strstr(unsigned char *, unsigned char *, long *, long);
-    unsigned char * lzss_memcomp(unsigned char *, long *, long *);
+    unsigned char lzss_rd(unsigned char *, int);
+    int lzss_comp_strstr(unsigned char *, unsigned char *, int *, int);
+    unsigned char * lzss_memcomp(unsigned char *, int *, int *);
 };
 
 #endif