Changeset 18472 in vbox for trunk/src/recompiler_new

Timestamp:

Mar 29, 2009 12:24:23 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

45305

Message:

qemu-common.h: Fixed incorrect PRI* macros. (caused warnings on 64-bit windows)

File:

• trunk/src/recompiler_new/qemu-common.h (modified) (2 diffs)

trunk/src/recompiler_new/qemu-common.h

@@ -5 +5 @@
 #ifdef VBOX
 
-#include <string.h>
+# include <string.h>
+# if !defined(_MSC_VER)
+#  include <inttypes.h>
+# endif
 
 void pstrcpy(char *buf, int buf_size, const char *str);
 char *pstrcat(char *buf, int buf_size, const char *s);
-#define snprintf RTStrPrintf
-#ifndef PRId32
-#define PRId32 "I32d"
-#define PRIx32 "I32x"
-#define PRIu32 "I32u"
-#define PRIo32 "I32o"
-#define PRId64 "I64d"
-#define PRIx64 "I64x"
-#define PRIu64 "I64u"
-#define PRIo64 "I64o"
-#endif
+# define snprintf RTStrPrintf
 
-#else
+# ifdef _MSC_VER
+#  define PRId32 "d"
+#  define PRIx32 "x"
+#  define PRIu32 "u"
+#  define PRIo32 "o"
+#  ifdef DEBUG_TMP_LOGGING
+#   define PRId64 "I64d"
+#   define PRIx64 "I64x"
+#   define PRIu64 "I64u"
+#   define PRIo64 "I64o"
+#  else
+#   define PRId64 "RI64"
+#   define PRIx64 "RX64"
+#   define PRIu64 "RU64"
+#  endif
+# endif /* _MSC_VER */
+
+#else /* !VBOX */
 /* we put basic includes here to avoid repeating them in device drivers */
 #include <stdlib.h>
@@ -161 +171 @@
 /* Force QEMU to stop what it's doing and service IO */
 void qemu_service_io(void);
-#endif // !VBOX
+#endif /* !VBOX */
 
 #endif