From b8d0da94c3014753ce948f5d861ebfebb467eafe Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Sun, 26 Feb 2006 21:27:02 +0000
Subject: * Merged ioq3-r589

---
 src/qcommon/q_shared.h | 4 +++-
 src/qcommon/vm.c       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/qcommon')

diff --git a/src/qcommon/q_shared.h b/src/qcommon/q_shared.h
index 518eab41..0059cdfa 100644
--- a/src/qcommon/q_shared.h
+++ b/src/qcommon/q_shared.h
@@ -105,7 +105,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifdef Q3_VM
 typedef int intptr_t;
 #else
-#include <inttypes.h>
+# ifndef _MSC_VER
+#  include <stdint.h>
+# endif
 #endif
 
 typedef unsigned char 		byte;
diff --git a/src/qcommon/vm.c b/src/qcommon/vm.c
index 515afc9b..27f30f09 100644
--- a/src/qcommon/vm.c
+++ b/src/qcommon/vm.c
@@ -887,6 +887,6 @@ void VM_LogSyscalls( int *args ) {
 		f = fopen("syscalls.log", "w" );
 	}
 	callnum++;
-	fprintf(f, "%i: %"PRIiPTR" (%i) = %i %i %i %i\n", callnum, (intptr_t)(args - (int *)currentVM->dataBase),
+	fprintf(f, "%i: %p (%i) = %i %i %i %i\n", callnum, (void*)(args - (int *)currentVM->dataBase),
 		args[0], args[1], args[2], args[3], args[4] );
 }
-- 
cgit