Refactor headers

[wimlib] / include / wimlib.h

diff --git a/src/wimlib.h b/include/wimlib.h
similarity index 99%
rename from src/wimlib.h
rename to include/wimlib.h
index ab0d43ba68b0e32e7015396db3faa43bbcba5278..16f4ba9c2813be433b11c7b330c2c7ede4f249e7 100644 (file)
--- a/src/wimlib.h
+++ b/include/wimlib.h
@@ -179,7 +179,10 @@
  * Use wimlib_write() or wimlib_overwrite() to actually write an on-disk WIM
  * file from a ::WIMStruct.
  */
+#ifndef WIMLIB_WIMSTRUCT_DECLARED
 typedef struct WIMStruct WIMStruct;
+#define WIMLIB_WIMSTRUCT_DECLARED
+#endif
 
 #ifdef __WIN32__
 typedef wchar_t wimlib_tchar;
@@ -1637,7 +1640,7 @@ wimlib_global_init(int init_flags);
  * memory allocated by the library.
  */
 extern void
-wimlib_global_cleanup();
+wimlib_global_cleanup(void);
 
 /**
  * Returns true if the WIM has an integrity table.