diff options
author | Chris Wilson <chris+github@qwirx.com> | 2006-09-03 23:39:08 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2006-09-03 23:39:08 +0000 |
commit | eeeb123dddad8e61c5316fcbddfe24d9750b63e3 (patch) | |
tree | 33d859892f73a1dc0016b125c1deaacf3eea0e22 /lib | |
parent | 4434ff992787675604d9868d555887579d07fc52 (diff) |
(refs #3)
Use INVALID_HANDLE_VALUE instead of NULL for invalid handles on Win32
Diffstat (limited to 'lib')
-rw-r--r-- | lib/common/FileStream.cpp | 10 | ||||
-rw-r--r-- | lib/common/FileStream.h | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/common/FileStream.cpp b/lib/common/FileStream.cpp index 917dc9c9..c6c53f2b 100644 --- a/lib/common/FileStream.cpp +++ b/lib/common/FileStream.cpp @@ -30,7 +30,7 @@ FileStream::FileStream(const char *Filename, int flags, int mode) mIsEOF(false) { #ifdef WIN32 - if(mOSFileHandle == 0) + if(mOSFileHandle == INVALID_HANDLE_VALUE) #else if(mOSFileHandle < 0) #endif @@ -56,7 +56,11 @@ FileStream::FileStream(tOSFileHandle FileDescriptor) : mOSFileHandle(FileDescriptor), mIsEOF(false) { +#ifdef WIN32 + if(mOSFileHandle == INVALID_HANDLE_VALUE) +#else if(mOSFileHandle < 0) +#endif { MEMLEAKFINDER_NOT_A_LEAK(this); THROW_EXCEPTION(CommonException, OSFileOpenError) @@ -76,7 +80,11 @@ FileStream::FileStream(const FileStream &rToCopy) : mOSFileHandle(::dup(rToCopy.mOSFileHandle)), mIsEOF(rToCopy.mIsEOF) { +#ifdef WIN32 + if(mOSFileHandle == INVALID_HANDLE_VALUE) +#else if(mOSFileHandle < 0) +#endif { MEMLEAKFINDER_NOT_A_LEAK(this); THROW_EXCEPTION(CommonException, OSFileOpenError) diff --git a/lib/common/FileStream.h b/lib/common/FileStream.h index 7a4a29f3..721bf3dd 100644 --- a/lib/common/FileStream.h +++ b/lib/common/FileStream.h @@ -21,7 +21,7 @@ #endif #ifdef WIN32 - #define INVALID_FILE NULL + #define INVALID_FILE INVALID_HANDLE_VALUE typedef HANDLE tOSFileHandle; #else #define INVALID_FILE -1 |