From 0e77095acee3c7ba28323f1efb765e106368cafb Mon Sep 17 00:00:00 2001 From: ulfjorensen Date: Mon, 24 Jan 2011 19:44:09 +0000 Subject: [PATCH] Experimental bugfix: avoid most pstdint.h stuff when VC10 stdint.h is included. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@897 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- code/pstdint.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/pstdint.h b/code/pstdint.h index 73de63075..7d0e2bc58 100644 --- a/code/pstdint.h +++ b/code/pstdint.h @@ -190,7 +190,7 @@ * do nothing else. On the Mac OS X version of gcc this is _STDINT_H_. */ -#if ((defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L) || (defined (__WATCOMC__) && (defined (_STDINT_H_INCLUDED) || __WATCOMC__ >= 1250)) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_)) )) && !defined (_PSTDINT_H_INCLUDED) +#if ((defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L) || (defined (__WATCOMC__) && (defined (_STDINT_H_INCLUDED) || __WATCOMC__ >= 1250)) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_)))) && !defined (_PSTDINT_H_INCLUDED) && !defined(_STDINT) #include #define _PSTDINT_H_INCLUDED # ifndef PRINTF_INT64_MODIFIER