aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea>2006-02-26 20:01:45 +0000
committerludwig <ludwig@edf5b092-35ff-0310-97b2-ce42778d08ea>2006-02-26 20:01:45 +0000
commit76a733c89276a52553b683ca24509f31af0cd72a (patch)
tree4191601a457b07de557fbd0dd3748cf00920c837
parentf8bc3409cbd9a36f756086259f964be795b59b4c (diff)
downloadioquake3-aero-76a733c89276a52553b683ca24509f31af0cd72a.tar.gz
ioquake3-aero-76a733c89276a52553b683ca24509f31af0cd72a.zip
try to fix msvc build
git-svn-id: svn://svn.icculus.org/quake3/trunk@588 edf5b092-35ff-0310-97b2-ce42778d08ea
-rw-r--r--code/qcommon/q_shared.h4
-rw-r--r--code/qcommon/vm.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index 2d4b3e1..c2edca1 100644
--- a/code/qcommon/q_shared.h
+++ b/code/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/code/qcommon/vm.c b/code/qcommon/vm.c
index ed38ad0..9e18f1c 100644
--- a/code/qcommon/vm.c
+++ b/code/qcommon/vm.c
@@ -886,6 +886,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] );
}