resource reading cleanups

[wimlib] / include / wimlib / win32.h

diff --git a/include/wimlib/win32.h b/include/wimlib/win32.h
index 9ab141f1543968efc24da15f02bd95c909511890..96d2ebd2a6505e7a6a05ea95142f4b6a50db1090 100644 (file)
--- a/include/wimlib/win32.h
+++ b/include/wimlib/win32.h
@@ -1,24 +1,21 @@
 #ifndef _WIMLIB_WIN32_H
 #define _WIMLIB_WIN32_H
 
-#ifndef __WIN32__
-#  error "This header is for Win32 only"
-#endif
+#ifdef __WIN32__
 
-#include "wimlib/callback.h"
 #include "wimlib/types.h"
 
 struct blob_descriptor;
+struct read_blob_callbacks;
 
 extern int
 read_winnt_stream_prefix(const struct blob_descriptor *blob, u64 size,
-                        consume_data_callback_t cb, void *cb_ctx);
+                        const struct read_blob_callbacks *cbs);
 
 extern int
 read_win32_encrypted_file_prefix(const struct blob_descriptor *blob,
                                 u64 size,
-                                consume_data_callback_t cb,
-                                void *cb_ctx);
+                                const struct read_blob_callbacks *cbs);
 
 extern int
 win32_global_init(int init_flags);
@@ -29,12 +26,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);
 
@@ -56,4 +47,6 @@ 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);
 
+#endif /* __WIN32__ */
+
 #endif /* _WIMLIB_WIN32_H */