17 files changed, 70 insertions, 26 deletions

diff --git a/default.bld b/default.bld
index 9d94f73..ea83827 100644
--- a/default.bld
+++ b/default.bld
@@ -36,13 +36,23 @@ target files("src/*.h").replace("src/", "bu/")
         input OUTPUT.replace("bu/","src/");
         profile "build"
         {
-                execute("ln -s ../${INPUT} ${OUTPUT}");
+                execute("mkdir -p $(dirname ${OUTPUT}); ln -s ../${INPUT} ${OUTPUT}");
+        }
+}
+target files("src/compat/*.h").replace("src/", "bu/")
+{
+        tag "header-links";
+        display "symlink";
+        input OUTPUT.replace("bu/","src/");
+        profile "build"
+        {
+                execute("mkdir -p $(dirname ${OUTPUT}); ln -s ../../${INPUT} ${OUTPUT}");
         }
 }
 
 target "libbu++.a"
 {
-        input files("src/*.cpp");
+        input files("src/*.cpp", "src/compat/*.cpp");
         rule "lib";
         CXXFLAGS += "-I. -fPIC";
 }
@@ -120,7 +130,9 @@ target "libbu++-r$(svnversion "-n").tar.bz2"
                 files("src/tools/*.cpp"),
                 files("src/tools/*.h"),
                 files("src/unit/*.unit"),
-                files("src/doxy/*.dox")
+                files("src/doxy/*.dox"),
+                files("src/compat/*.cpp"),
+                files("src/compat/*.h")
                 ];
         rule "tarball";
         tag "pkg";
diff --git a/mingw.bld b/mingw.bld
index 61dbeaf..7bdf474 100644
--- a/mingw.bld
+++ b/mingw.bld
@@ -6,13 +6,11 @@
 
 CXXFLAGS += "-ggdb -W -Wall";
 
-
 action "default"
 {
         build: [targets("header-links"), "libbu++win.a"];
 }
 
-
 target files("src/*.h").replace("src/", "bu/")
 {
         tag "header-links";
@@ -20,13 +18,23 @@ target files("src/*.h").replace("src/", "bu/")
         input OUTPUT.replace("bu/","src/");
         profile "build"
         {
-                execute("ln -s ../${INPUT} ${OUTPUT}");
+                execute("mkdir -p $(dirname ${OUTPUT}); ln -s ../${INPUT} ${OUTPUT}");
+        }
+}
+target files("src/compat/*.h").replace("src/", "bu/")
+{
+        tag "header-links";
+        display "symlink";
+        input OUTPUT.replace("bu/","src/");
+        profile "build"
+        {
+                execute("mkdir -p $(dirname ${OUTPUT}); ln -s ../../${INPUT} ${OUTPUT}");
         }
 }
 
 target "libbu++win.a"
 {
-        input files("src/*.cpp");
+        input files("src/*.cpp", "src/compat/*.cpp");
         rule "lib";
         CXXFLAGS += "-I. -Isupport/windows";
 }
@@ -45,6 +53,13 @@ target "src/regex.win_o"
                 execute("rm -f src/regex.win_o && touch src/regex.win_o && echo NOT BUILDING REGEX RIGHT NOW!!!");
         }
 }
+target "src/cachestorefiles.win_o"
+{
+        profile "build"
+        {
+                execute("rm -f src/cachestorefiles.win_o && touch src/cachestorefiles.win_o && echo NOT BUILDING REGEX RIGHT NOW!!!");
+        }
+}
 
 function cppToWinObj()
 {
diff --git a/src/linux_compatibility.h b/src/compat/linux.h
index ccc8536..ccc8536 100644
--- a/src/linux_compatibility.h
+++ b/src/compat/linux.h
diff --git a/src/osx_compatibility.h b/src/compat/osx.h
index 7169d7e..7169d7e 100644
--- a/src/osx_compatibility.h
+++ b/src/compat/osx.h
diff --git a/src/win32_compatibility.cpp b/src/compat/win32.cpp
index 98e63a7..6fcac15 100644
--- a/src/win32_compatibility.cpp
+++ b/src/compat/win32.cpp
@@ -5,7 +5,7 @@
  * terms of the license contained in the file LICENSE.
  */
 
-#include "bu/win32_compatibility.h"
+#include "bu/compat/win32.h"
 
 #ifdef WIN32
 
diff --git a/src/win32_compatibility.h b/src/compat/win32.h
index 220ed09..6304d4c 100644
--- a/src/win32_compatibility.h
+++ b/src/compat/win32.h
@@ -124,6 +124,8 @@ namespace Bu
 
 #undef decltype
 
+#undef USE_64BIT_IO
+
 #endif /* WIN32 */
 #endif
 
diff --git a/src/config.h b/src/config.h
new file mode 100644
index 0000000..05ef99a
--- /dev/null
+++ b/src/config.h
@@ -0,0 +1,11 @@
+#ifndef BU_CONFIG_H
+#define BU_CONFIG_H
+
+// Use 64 bit IO functions where applicable (i.e. large file support)
+#define USE_64BIT_IO
+
+#include "bu/compat/win32.h"
+#include "bu/compat/osx.h"
+#include "bu/compat/linux.h"
+
+#endif
diff --git a/src/fifo.cpp b/src/fifo.cpp
index ebea927..d1fa960 100644
--- a/src/fifo.cpp
+++ b/src/fifo.cpp
@@ -12,7 +12,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "win32_compatibility.h"
+#include "bu/config.h"
 
 namespace Bu { subExceptionDef( FifoException ) }
 
diff --git a/src/file.cpp b/src/file.cpp
index 4d79f1e..f1f63e4 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -13,13 +13,19 @@
 #include <unistd.h>
 #include <stdlib.h> // for mkstemp
 
+#include "bu/config.h"
+
 namespace Bu { subExceptionDef( FileException ) }
 
 Bu::File::File( const Bu::FString &sName, int iFlags ) :
         fd( -1 ),
         bEos( true )
 {
+#ifdef USE_64BIT_IO
+        fd = ::open64( sName.getStr(), getPosixFlags( iFlags ), 0666 );
+#else
         fd = ::open( sName.getStr(), getPosixFlags( iFlags ), 0666 );
+#endif
         if( fd < 0 )
         {
                 throw Bu::FileException( errno, "%s: %s",
diff --git a/src/ito.cpp b/src/ito.cpp
index 0218ecc..12aee6f 100644
--- a/src/ito.cpp
+++ b/src/ito.cpp
@@ -6,7 +6,8 @@
  */
 
 #include "bu/ito.h"
-#include "bu/osx_compatibility.h"
+
+#include "bu/config.h"
 
 Bu::Ito::Ito()
 {
diff --git a/src/itoserver.cpp b/src/itoserver.cpp
index 279310d..a1d804a 100644
--- a/src/itoserver.cpp
+++ b/src/itoserver.cpp
@@ -5,14 +5,13 @@
  * terms of the license contained in the file LICENSE.
  */
 
-#include "win32_compatibility.h"
-
 #include "bu/itoserver.h"
 #include <errno.h>
 #include "bu/serversocket.h"
 #include "bu/client.h"
 #include "bu/socket.h"
-#include "bu/osx_compatibility.h"
+
+#include "bu/config.h"
 
 Bu::ItoServer::ItoServer() :
         nTimeoutSec( 1 ),
diff --git a/src/multiserver.cpp b/src/multiserver.cpp
index 4eccde8..a6cee36 100644
--- a/src/multiserver.cpp
+++ b/src/multiserver.cpp
@@ -5,12 +5,12 @@
  * terms of the license contained in the file LICENSE.
  */
 
-#include "win32_compatibility.h"
-
 #include "bu/multiserver.h"
 #include "bu/protocol.h"
 #include "bu/client.h"
 
+#include "bu/config.h"
+
 Bu::MultiServer::MultiServer()
 {
 }
diff --git a/src/process.cpp b/src/process.cpp
index c6c86f2..da38e64 100644
--- a/src/process.cpp
+++ b/src/process.cpp
@@ -15,9 +15,8 @@
 #include <errno.h>
 
 #include <sys/select.h>
-#include "bu/osx_compatibility.h"
-#include "bu/win32_compatibility.h"
-#include "bu/linux_compatibility.h"
+
+#include "bu/config.h"
 
 Bu::Process::Process( Flags eFlags, const char *sName, char *const argv[] ) :
         iStdIn( -1 ),
diff --git a/src/server.cpp b/src/server.cpp
index e55713d..64ddf9f 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -11,7 +11,7 @@
 #include "bu/serversocket.h"
 #include "bu/client.h"
 #include "bu/socket.h"
-#include "bu/osx_compatibility.h"
+#include "bu/config.h"
 
 Bu::Server::Server() :
         nTimeoutSec( 0 ),
diff --git a/src/server.h b/src/server.h
index d83c346..e09246f 100644
--- a/src/server.h
+++ b/src/server.h
@@ -20,7 +20,8 @@
 #include "bu/clientlink.h"
 #include "bu/clientlinkfactory.h"
 #include "bu/hash.h"
-#include "bu/win32_compatibility.h"
+
+#include "bu/config.h"
 
 namespace Bu
 {
diff --git a/src/serversocket.cpp b/src/serversocket.cpp
index 37eb3d4..87d0035 100644
--- a/src/serversocket.cpp
+++ b/src/serversocket.cpp
@@ -22,9 +22,8 @@
 //#include <termios.h>
 #include <fcntl.h>
 #include "bu/serversocket.h"
-#include "bu/osx_compatibility.h"
-#include "bu/win32_compatibility.h"
-#include "bu/linux_compatibility.h"
+
+#include "bu/config.h"
 
 namespace Bu { subExceptionDef( ServerSocketException ) }
 
diff --git a/src/socket.cpp b/src/socket.cpp
index a175ee9..6a30f44 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -15,9 +15,8 @@
 #include <errno.h>
 #include <fcntl.h>
 #include "bu/socket.h"
-#include "bu/osx_compatibility.h"
-#include "bu/win32_compatibility.h"
-#include "bu/linux_compatibility.h"
+
+#include "bu/config.h"
 
 #ifndef WIN32
  #include <sys/socket.h>