From c0b56448ab4d45903bb4be176f01f9fba5e4dbc6 Mon Sep 17 00:00:00 2001 From: luther Date: Sat, 15 Jul 2000 03:51:17 +0000 Subject: Fri Jul 14 22:41:53 2000 Luther J Baker --- PACE/ChangeLog | 7 +++++++ PACE/pace/fcntl.h | 4 ++-- PACE/pace/win32/fcntl.inl | 11 ++++++----- PACE/pace/win32/stat.h | 2 +- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/PACE/ChangeLog b/PACE/ChangeLog index fe6cf4554d9..3df74648525 100644 --- a/PACE/ChangeLog +++ b/PACE/ChangeLog @@ -1,3 +1,10 @@ +Fri Jul 14 22:41:53 2000 Luther J Baker + + * pace/fcntl.h: + * pace/fcntl.inl: + + Some old changes didn't seem to take? + Fri Jul 14 22:25:31 2000 Luther J Baker * pace/win32/dirent.inl: diff --git a/PACE/pace/fcntl.h b/PACE/pace/fcntl.h index 3fcd2ea618a..fa71ebd13ee 100644 --- a/PACE/pace/fcntl.h +++ b/PACE/pace/fcntl.h @@ -38,8 +38,8 @@ extern "C" { #if (PACE_HAS_POSIX_FS_UOF) PACE_INLINE int pace_creat (const char * path, pace_mode_t mode); /* WIN32 doesn't correctly return a file desciptor. WIN32 doesn't use - integers to represent file handles. Instead, we return (int)*HANDLE - for success and -1 for failure. + integers to represent file handles. Instead, we return 1 for success + and -1 for failure. */ #endif /* PACE_HAS_POSIX_FS_UOF */ diff --git a/PACE/pace/win32/fcntl.inl b/PACE/pace/win32/fcntl.inl index d7fdc704af6..01bfccb7a4d 100644 --- a/PACE/pace/win32/fcntl.inl +++ b/PACE/pace/win32/fcntl.inl @@ -146,12 +146,13 @@ pace_win32_emulation_creat (const char * path, pace_mode_t mode) } else { - /* POSIX needs an integer - return h; - Should return lowest unused file descriptor but windows - doesn't do that. So we return a (int) casted HANDLE. + /* return h; + + POSIX returns lowest unused file descriptor but windows + doesn't handle files in the same manner. + We return -1 for failure and 1 for success. */ - return (int)*h; + return 1; } } #endif /* PACE_HAS_POSIX_FS_UOF */ diff --git a/PACE/pace/win32/stat.h b/PACE/pace/win32/stat.h index 431b016154b..e04f9fabedf 100644 --- a/PACE/pace/win32/stat.h +++ b/PACE/pace/win32/stat.h @@ -50,7 +50,7 @@ extern "C" { #ifndef PACE_STAT #define PACE_STAT - typedef struct stat pace_stat; + typedef struct stat pace_stat_s; #endif /* PACE_STAT */ #if defined (PACE_HAS_CPLUSPLUS) -- cgit v1.2.1