summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid <david@xagasoft.com>2008-10-02 18:31:38 +0000
committerDavid <david@xagasoft.com>2008-10-02 18:31:38 +0000
commit79ee32aa24e31d5bb786d0c162ad8145cc7c1f35 (patch)
tree4f473c795ebdc6c70fea4943cde9e3c556e5890b
parent322b785e7a686ea72f7c89e6ad9529a547c62eed (diff)
downloadlibbu++-79ee32aa24e31d5bb786d0c162ad8145cc7c1f35.tar.gz
libbu++-79ee32aa24e31d5bb786d0c162ad8145cc7c1f35.tar.bz2
libbu++-79ee32aa24e31d5bb786d0c162ad8145cc7c1f35.tar.xz
libbu++-79ee32aa24e31d5bb786d0c162ad8145cc7c1f35.zip
david apparently window doesn't have O_NONBLOCK
-rw-r--r--buildMinGW.conf2
-rw-r--r--src/file.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/buildMinGW.conf b/buildMinGW.conf
index 03c9b38..79538e3 100644
--- a/buildMinGW.conf
+++ b/buildMinGW.conf
@@ -22,7 +22,7 @@ filesIn("src") filter regexp("^src/(.*)\\.h$", "bu/{re:1}.h"):
22 target file, 22 target file,
23 set "CXXFLAGS" += "-I.", 23 set "CXXFLAGS" += "-I.",
24 #input filesIn("src") filter regexp("^.*\\.cpp$") 24 #input filesIn("src") filter regexp("^.*\\.cpp$")
25 input ["src/list.cpp", "src/exceptionbase.cpp", "src/exceptions.cpp", "src/fstring.cpp", "src/file.cpp", "src/hash.cpp", "src/sptr.cpp", "src/tafnode.cpp", "src/tafreader.cpp", "src/tafwriter.cpp", "src/stdstream.cpp", "src/stream.cpp", "src/archive.cpp", "src/archival.cpp"] 25 input ["src/list.cpp", "src/exceptionbase.cpp", "src/fstring.cpp", "src/file.cpp", "src/hash.cpp", "src/sptr.cpp", "src/tafnode.cpp", "src/tafreader.cpp", "src/tafwriter.cpp", "src/stdstream.cpp", "src/stream.cpp", "src/archive.cpp", "src/archival.cpp"]
26 26
27rule "exe": 27rule "exe":
28 matches regexp("(.*)\\.win_o$"), 28 matches regexp("(.*)\\.win_o$"),
diff --git a/src/file.cpp b/src/file.cpp
index 9c8ae90..29d2805 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -200,8 +200,10 @@ int Bu::File::getPosixFlags( int iFlags )
200 iRet |= O_APPEND; 200 iRet |= O_APPEND;
201 if( (iFlags&Truncate) ) 201 if( (iFlags&Truncate) )
202 iRet |= O_TRUNC; 202 iRet |= O_TRUNC;
203#ifndef WIN32
203 if( (iFlags&NonBlock) ) 204 if( (iFlags&NonBlock) )
204 iRet |= O_NONBLOCK; 205 iRet |= O_NONBLOCK;
206#endif
205 if( (iFlags&Exclusive) ) 207 if( (iFlags&Exclusive) )
206 iRet |= O_EXCL; 208 iRet |= O_EXCL;
207 209