Fixes

frida · Feb 26, 2024 · 4f019cc · 4f019cc
1 parent 678fa46
commit 4f019cc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/gum/backend-linux/gumprocess-linux.c b/gum/backend-linux/gumprocess-linux.c
@@ -48,9 +48,8 @@
 #ifdef HAVE_SYS_USER_H
 # include <sys/user.h>
 #endif
-#ifdef HAVE_LINUX
+#include <sys/time.h>
 #include <sys/resource.h>
-#endif
 
 #define GUM_PAGE_START(value, page_size) \
     (GUM_ADDRESS (value) & ~GUM_ADDRESS (page_size - 1))
@@ -90,6 +89,9 @@
 #ifndef NT_PRSTATUS
 # define NT_PRSTATUS 1
 #endif
+#ifndef RUSAGE_THREAD
+# define RUSAGE_THREAD 1
+#endif
 
 #define GUM_TEMP_FAILURE_RETRY(expression) \
     ({ \

diff --git a/gum/backend-windows/gumprocess-windows.c b/gum/backend-windows/gumprocess-windows.c
@@ -643,7 +643,7 @@ gum_thread_resume (GumThreadId thread_id,
 guint64
 gum_thead_get_user_time (void)
 {
-  static gboolean initialized = false;
+  static gboolean initialized = FALSE;
   static GetThreadTimesFunc get_thread_times = NULL;
 
   HMODULE mod;
@@ -668,7 +668,7 @@ gum_thead_get_user_time (void)
   if (!get_thread_times (GetCurrentThread (), NULL, NULL, NULL, &userTime))
     return 0;
 
-  result = ((guint64) userTime.dwHighDateTime) << 32 + userTime.dwLowDateTime;
+  result = (((guint64) userTime.dwHighDateTime) << 32) + userTime.dwLowDateTime;
 
   /* Timings on Windows are to 100-nanosecond granularity. Convert to u-secs */
   return result / 10;