Do not use read() and write() from MSVCRT

[wimlib] / include / wimlib / win32.h

diff --git a/include/wimlib/win32.h b/include/wimlib/win32.h
index dd3c5c9c1c24dd72cc0c2ece75649d164b3e391b..f0f99cc7cf2bc2680c1a5cdf2f86bd3a5dc789f9 100644 (file)
--- a/include/wimlib/win32.h
+++ b/include/wimlib/win32.h
@@ -1,22 +1,31 @@
+/*
+ * win32.h - Windows-specific declarations needed by non-Windows-specific files.
+ */
+
 #ifndef _WIMLIB_WIN32_H
 #define _WIMLIB_WIN32_H
 
 #ifdef __WIN32__
 
-#include "wimlib/callback.h"
 #include "wimlib/types.h"
 
 struct blob_descriptor;
+struct read_blob_callbacks;
+struct windows_file;
+
+extern struct windows_file *
+clone_windows_file(const struct windows_file *file);
+
+extern void
+free_windows_file(struct windows_file *file);
 
 extern int
-read_winnt_stream_prefix(const struct blob_descriptor *blob, u64 size,
-                        consume_data_callback_t cb, void *cb_ctx);
+cmp_windows_files(const struct windows_file *file1,
+                 const struct windows_file *file2);
 
 extern int
-read_win32_encrypted_file_prefix(const struct blob_descriptor *blob,
-                                u64 size,
-                                consume_data_callback_t cb,
-                                void *cb_ctx);
+read_windows_file_prefix(const struct blob_descriptor *blob, u64 size,
+                        const struct read_blob_callbacks *cbs);
 
 extern int
 win32_global_init(int init_flags);
@@ -27,12 +36,6 @@ win32_global_cleanup(void);
 extern int
 fsync(int fd);
 
-extern unsigned
-win32_get_number_of_processors(void);
-
-extern u64
-win32_get_avail_memory(void);
-
 extern tchar *
 realpath(const tchar *path, tchar *resolved_path);
 
@@ -49,10 +52,16 @@ extern FILE *
 win32_open_logfile(const wchar_t *path);
 
 extern ssize_t
-pread(int fd, void *buf, size_t count, off_t offset);
+win32_read(int fd, void *buf, size_t count);
+
+extern ssize_t
+win32_write(int fd, const void *buf, size_t count);
+
+extern ssize_t
+win32_pread(int fd, void *buf, size_t count, off_t offset);
 
 extern ssize_t
-pwrite(int fd, const void *buf, size_t count, off_t offset);
+win32_pwrite(int fd, const void *buf, size_t count, off_t offset);
 
 #endif /* __WIN32__ */