X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwim.c;h=1c0e6efdf96ae5576b53de16161973010535ffef;hb=b5fae0e5ddac332b25856e3df7556aa3ee7f69fb;hp=7b1347dd93379ccc29726ad57d9d4c7f8a3fa689;hpb=4c73e29d8d74a4e969782d2d40e209337414034c;p=wimlib

diff --git a/src/wim.c b/src/wim.c
index 7b1347dd..1c0e6efd 100644
--- a/src/wim.c
+++ b/src/wim.c
@@ -24,6 +24,8 @@
 #endif
 
 #include "wimlib.h"
+#include "wimlib/assert.h"
+#include "wimlib/bitops.h"
 #include "wimlib/dentry.h"
 #include "wimlib/encoding.h"
 #include "wimlib/file_io.h"
@@ -36,7 +38,6 @@
 #include "wimlib/security.h"
 #include "wimlib/wim.h"
 #include "wimlib/xml.h"
-#include "wimlib/version.h"
 
 #ifdef __WIN32__
 #  include "wimlib/win32.h" /* for realpath() replacement */
@@ -96,7 +97,7 @@ wim_chunk_size_valid(u32 chunk_size, int ctype)
 	/* Chunk size must be power of 2.  */
 	if (chunk_size == 0)
 		return false;
-	order = bsr32(chunk_size);
+	order = fls32(chunk_size);
 	if (chunk_size != 1U << order)
 		return false;
 
@@ -355,7 +356,7 @@ select_wim_image(WIMStruct *wim, int image)
 	if (imd->root_dentry || imd->modified) {
 		ret = 0;
 	} else {
-		ret = read_metadata_resource(wim, imd);
+		ret = read_metadata_resource(imd);
 		if (ret)
 			wim->current_image = WIMLIB_NO_IMAGE;
 	}
@@ -916,7 +917,9 @@ test_locale_ctype_utf8(void)
 WIMLIBAPI u32
 wimlib_get_version(void)
 {
-	return WIMLIB_VERSION_CODE;
+	return (WIMLIB_MAJOR_VERSION << 20) |
+	       (WIMLIB_MINOR_VERSION << 10) |
+		WIMLIB_PATCH_VERSION;
 }
 
 static bool lib_initialized = false;