Changeset 7433 in orxonox.OLD for trunk/src/lib/util

Timestamp:

Apr 29, 2006, 2:33:03 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Working on Windows too

File:

• trunk/src/lib/util/osdir.h (modified) (4 diffs)

trunk/src/lib/util/osdir.h

@@ -121 +121 @@
 #elif defined(OSLINK_OSDIR_WINDOWS)
 
+#ifdef DATADIR
+#undef DATADIR
+#endif
+
 #include <windows.h>
 #include <winbase.h>
@@ -137 +141 @@
       ~Directory()
       {
-          this->close
+        this->close();
       }
 
@@ -151 +155 @@
         {
           willfail = true;
-          return;
+          return false;
         }
         std::string Full(directoryName);
@@ -160 +164 @@
         handle = FindFirstFile( (Full+"*").c_str(), &entry);
         if (handle == INVALID_HANDLE_VALUE)
-          willfail = true;
-        else
-          current = entry.cFileName;
+          {
+            willfail = true;
+            return false;
+          }
+        else
+          {
+            willfail = false;
+            current = entry.cFileName;
+            return true;
+          }
       }