[Box Backup-commit] COMMIT r2298 - box/trunk/lib/common

boxbackup-dev@fluffy.co.uk boxbackup-dev@fluffy.co.uk
Fri, 26 Sep 2008 21:23:34 +0100 (BST)


Author: chris
Date: 2008-09-26 21:23:34 +0100 (Fri, 26 Sep 2008)
New Revision: 2298

Modified:
   box/trunk/lib/common/FileStream.h
Log:
Remove #ifdef WIN32 as we now define O_BINARY to 0 on Unixes, so
the same code can be used for both.


Modified: box/trunk/lib/common/FileStream.h
===================================================================
--- box/trunk/lib/common/FileStream.h	2008-09-26 20:22:47 UTC (rev 2297)
+++ box/trunk/lib/common/FileStream.h	2008-09-26 20:23:34 UTC (rev 2298)
@@ -32,22 +32,14 @@
 {
 public:
 	FileStream(const std::string& rFilename, 
-#ifdef WIN32
 		int flags = (O_RDONLY | O_BINARY),
-#else
-		int flags = O_RDONLY,
-#endif
 		int mode = (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
 
 	// Ensure that const char * name doesn't end up as a handle
 	// on Windows!
 
 	FileStream(const char *pFilename, 
-#ifdef WIN32
 		int flags = (O_RDONLY | O_BINARY),
-#else
-		int flags = O_RDONLY,
-#endif
 		int mode = (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
 
 	FileStream(tOSFileHandle FileDescriptor);