x86_cpu_features.c: cpuid fix for x86_32 PIC with old GCC versions

[wimlib] / src / util.c

diff --git a/src/util.c b/src/util.c
index f22d451e6e8f4b4fd08c5a023dbaecb90ea62017..928a0368668ce06bd4a3236018c707148ffe4068 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 #ifdef HAVE_SYS_SYSCTL_H
+#  include <sys/types.h>
 #  include <sys/sysctl.h>
 #endif
 #include <unistd.h>
@@ -90,28 +91,14 @@ wimlib_calloc(size_t nmemb, size_t size)
 char *
 wimlib_strdup(const char *str)
 {
-       size_t size;
-       char *p;
-
-       size = strlen(str);
-       p = MALLOC(size + 1);
-       if (p)
-               p = memcpy(p, str, size + 1);
-       return p;
+       return memdup(str, strlen(str) + 1);
 }
 
 #ifdef __WIN32__
 wchar_t *
 wimlib_wcsdup(const wchar_t *str)
 {
-       size_t size;
-       wchar_t *p;
-
-       size = wcslen(str);
-       p = MALLOC((size + 1) * sizeof(wchar_t));
-       if (p)
-               p = wmemcpy(p, str, size + 1);
-       return p;
+       return memdup(str, (wcslen(str) + 1) * sizeof(wchar_t));
 }
 #endif