diff options
author | Martin Ebourne <martin@ebourne.me.uk> | 2005-12-12 20:50:00 +0000 |
---|---|---|
committer | Martin Ebourne <martin@ebourne.me.uk> | 2005-12-12 20:50:00 +0000 |
commit | 3bedf8846f4d7a5cb38276b274662d62a36dcd52 (patch) | |
tree | 9d51de8b0f3d06ba6549a5a1958e52f592343140 /lib/common/FileStream.h | |
parent | 81d8eda2419e7a23088a98cdfc52a305c9ceac0d (diff) |
Marged chris/win32/merge/07-win32-fixes at r210 to trunk
Diffstat (limited to 'lib/common/FileStream.h')
-rwxr-xr-x | lib/common/FileStream.h | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/lib/common/FileStream.h b/lib/common/FileStream.h index bb3cc459..7d677636 100755 --- a/lib/common/FileStream.h +++ b/lib/common/FileStream.h @@ -17,12 +17,26 @@ #include <sys/stat.h> #include <unistd.h> +#ifdef WIN32 + #define INVALID_FILE NULL + typedef HANDLE tOSFileHandle; +#else + #define INVALID_FILE -1 + typedef int tOSFileHandle; +#endif + class FileStream : public IOStream { public: - FileStream(const char *Filename, int flags = O_RDONLY, int mode = (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); - FileStream(int FileDescriptor); - FileStream(const FileStream &rToCopy); + FileStream(const char *Filename, +#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); + virtual ~FileStream(); virtual int Read(void *pBuffer, int NBytes, int Timeout = IOStream::TimeOutInfinite); @@ -36,8 +50,14 @@ public: virtual bool StreamClosed(); private: - int mOSFileHandle; + tOSFileHandle mOSFileHandle; bool mIsEOF; + FileStream(const FileStream &rToCopy) { /* do not call */ } + +#ifdef WIN32 + // for debugging.. + std::string fileName; +#endif }; |