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

Timestamp:

Jun 8, 2006, 11:11:37 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the osX-branche back here
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/osx . -r7763:HEAD

conflicts resolved, and everything is working as expected (or at least i hope so )

File:

• trunk/src/lib/util/file.cc (modified) (1 diff)

trunk/src/lib/util/file.cc

@@ -23 +23 @@
 #include <fstream>
 
-#ifdef __unix__
+#ifdef __unix__ 
 #include <unistd.h>
 #elif __WIN32__ || _MS_DOS_
 #include <dir.h>
 #else
-#include <direct.h>
+//#include <direct.h>
 #endif