Consistently use _WIN32 instead of __WIN32__

[wimlib] / include / wimlib / win32.h

diff --git a/include/wimlib/win32.h b/include/wimlib/win32.h
index 46d48a80c96a0db169f6537b477c182c84ff049a..164620963affe2891ed4a89a8584f078e9d370cb 100644 (file)
--- a/include/wimlib/win32.h
+++ b/include/wimlib/win32.h
@@ -5,12 +5,12 @@
 #ifndef _WIMLIB_WIN32_H
 #define _WIMLIB_WIN32_H
 
-#ifdef __WIN32__
+#ifdef _WIN32
 
 #include "wimlib/types.h"
 
 struct blob_descriptor;
-struct read_blob_callbacks;
+struct consume_chunk_callback;
 struct windows_file;
 
 extern struct windows_file *
@@ -25,7 +25,8 @@ cmp_windows_files(const struct windows_file *file1,
 
 extern int
 read_windows_file_prefix(const struct blob_descriptor *blob, u64 size,
-                        const struct read_blob_callbacks *cbs);
+                        const struct consume_chunk_callback *cb,
+                        bool recover_data);
 
 extern int
 win32_global_init(int init_flags);
@@ -52,11 +53,17 @@ 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
-pwrite(int fd, const void *buf, size_t count, off_t offset);
+win32_write(int fd, const void *buf, size_t count);
 
-#endif /* __WIN32__ */
+extern ssize_t
+win32_pread(int fd, void *buf, size_t count, off_t offset);
+
+extern ssize_t
+win32_pwrite(int fd, const void *buf, size_t count, off_t offset);
+
+#endif /* _WIN32 */
 
 #endif /* _WIMLIB_WIN32_H */