diff options
| author | Samuel Williams <samuel.williams@oriontransfer.co.nz> | 2023-05-24 22:45:34 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-24 22:45:34 +0900 |
| commit | 6d976eb5348098a346d82065621e37925acae8b8 (patch) | |
| tree | 683b659bc406be332691f94ea6d41906fa0578c6 /include | |
| parent | 85b4cd7cf80d4029f65fde3e574b31f4b0e538ea (diff) | |
Fix "runs a C function with the global lock unlocked and unlocks IO with the generic RUBY_UBF_IO" on Windows. (#7848)
* Enable borked spec.
* Ensure win32 wrappers are visible and used.
* Reorganise `read`/`write`/`pipe` in `thread_spec.c`.
Notes
Notes:
Merged-By: ioquatix <samuel@codeotaku.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/win32.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/ruby/win32.h b/include/ruby/win32.h index 50713e9d6c..67cc5e70b3 100644 --- a/include/ruby/win32.h +++ b/include/ruby/win32.h @@ -148,8 +148,8 @@ typedef int clockid_t; #define close(h) rb_w32_close(h) #define fclose(f) rb_w32_fclose(f) -#define read(f, b, s) rb_w32_read(f, b, s, NULL) -#define write(f, b, s) rb_w32_write(f, b, s, NULL) +#define read(f, b, s) rb_w32_read(f, b, s) +#define write(f, b, s) rb_w32_write(f, b, s) #define HAVE_PREAD #define pread(f, b, s, o) rb_w32_pread(f, b, s, o) @@ -722,8 +722,8 @@ int rb_w32_wopen(const WCHAR *, int, ...); int rb_w32_close(int); int rb_w32_fclose(FILE*); int rb_w32_pipe(int[2]); -ssize_t rb_w32_read(int, void *, size_t, rb_off_t *offset); -ssize_t rb_w32_write(int, const void *, size_t, rb_off_t *offset); +ssize_t rb_w32_read(int, void *, size_t); +ssize_t rb_w32_write(int, const void *, size_t); ssize_t rb_w32_pread(int, void *, size_t, rb_off_t offset); ssize_t rb_w32_pwrite(int, const void *, size_t, rb_off_t offset); rb_off_t rb_w32_lseek(int, rb_off_t, int); |