AT LAST!!!

Windows 2k/XP CD reading works using raw ioctls!!!!

HURRAY!!!!!!!!

4 files changed, 4 insertions, 8 deletions

diff --git a/include/BString.h b/include/BString.h
index c4703f0..82fe1b5 100644
--- a/include/BString.h
+++ b/include/BString.h
@@ -20,7 +20,7 @@ class String : public Base {
       String(int);
       String(unsigned int);
       String(int64);
-      String(uint64);
+      String(Uint64);
       String(double);
       ~String();
     const char * set(const char *, va_list);
diff --git a/include/generic.h b/include/generic.h
index c31f8d3..0b16d2c 100644
--- a/include/generic.h
+++ b/include/generic.h
@@ -61,11 +61,11 @@ typedef int32 ssize_t;
 
 #if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__ || defined __MINGW32__ || defined FORCE64
 typedef long long int64;
-typedef unsigned long long uint64;
+typedef unsigned long long Uint64;
 #else
 #if defined _WIN32
 typedef _int64 int64;
-typedef unsigned _int64 uint64;
+typedef unsigned _int64 Uint64;
 #else
 #error Unsupported platform (need 64 bits ints definition)
 #endif
diff --git a/lib/Handle.cc b/lib/Handle.cc
index 182657d..74cf7f4 100644
--- a/lib/Handle.cc
+++ b/lib/Handle.cc
@@ -250,7 +250,6 @@ void Handle::close() throw (GeneralException) {
     }
     
     h = -1;
-    
     closed = 1;
 }
 
diff --git a/lib/String.cc b/lib/String.cc
index 75d9d15..82b0e00 100644
--- a/lib/String.cc
+++ b/lib/String.cc
@@ -46,9 +46,6 @@ String::String(char c) : siz(1) {
 }
 
 String::String(const char * s) : str(Base::strdup(s)), siz(::strlen(str)) {
-    if (!strcmp(s, "testing")) {
-	gruikptr = &str;
-    }
 #ifdef DEBUG
     fprintf(stderr, _("Creating a string with `%s' at %p from %p, this = %p\n"), str, str, s, this);
 #endif
@@ -93,7 +90,7 @@ String::String(int64 l) {
     siz = ::strlen(str);
 }
 
-String::String(uint64 l) {
+String::String(Uint64 l) {
 #ifndef HAVE_ASPRINTF
     char t[40];
     sprintf(t, "%llu", l);