[gdb/testsuite] Fix "unable to find usable gdb" error with cc-with-tweaks.exp

[deliverable/binutils-gdb.git] / gdb / amd64-windows-tdep.c

diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c
index 47feab98b0bf9749a6ed8a22e435a58f2cbd4fef..922da9e48bcbcba08eb4fbd45c013117606bcd24 100644 (file)
--- a/gdb/amd64-windows-tdep.c
+++ b/gdb/amd64-windows-tdep.c
@@ -18,7 +18,7 @@
 #include "defs.h"
 #include "osabi.h"
 #include "amd64-tdep.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 #include "gdbtypes.h"
 #include "gdbcore.h"
 #include "regcache.h"
@@ -144,7 +144,7 @@ amd64_windows_store_arg_in_reg (struct regcache *regcache,
 
   gdb_assert (TYPE_LENGTH (type) <= 8);
   memset (buf, 0, sizeof buf);
-  memcpy (buf, valbuf, std::min (TYPE_LENGTH (type), (unsigned int) 8));
+  memcpy (buf, valbuf, std::min (TYPE_LENGTH (type), (ULONGEST) 8));
   regcache->cooked_write (regno, buf);
 }