- define STRTOUQ the same as STRTOULL.

bochs/osdep.cc

@@ -54,7 +54,7 @@ int bx_snprintf (char *s, size_t maxlen, const char *format, ...)
 #endif  /* !BX_HAVE_SNPRINTF */
 
 
-#if !BX_HAVE_STRTOULL
+#if (!BX_HAVE_STRTOULL && !BX_HAVE_STRTOUQ)
 /* taken from glibc-2.2.2: strtod.c, and stripped down a lot.  There are 
    still a few leftover references to decimal points and exponents, 
    but it works for bases 10 and 16 */

bochs/osdep.h

@@ -57,8 +57,13 @@ extern "C" {
   extern int bx_snprintf (char *s, size_t maxlen, const char *format, ...);
 #endif
 
-#if !BX_HAVE_STRTOULL
-#define strtoull bx_strtoull
+#if BX_HAVE_STRTOULL
+  // great, just use the usual function
+#elif BX_HAVE_STRTOUQ
+  // they have strtouq and not strtoull
+  #define strtoull strtouq
+#else
+  #define strtoull bx_strtoull
   extern Bit64u bx_strtoull (const char *nptr, char **endptr, int baseignore);
 #endif