浏览代码

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
ulfjorensen 14 年之前
父节点
当前提交
0e77095ace
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      code/pstdint.h

+ 1 - 1
code/pstdint.h

@@ -190,7 +190,7 @@
  *  do nothing else.  On the Mac OS X version of gcc this is _STDINT_H_.
  *  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 <stdint.h>
 #include <stdint.h>
 #define _PSTDINT_H_INCLUDED
 #define _PSTDINT_H_INCLUDED
 # ifndef PRINTF_INT64_MODIFIER
 # ifndef PRINTF_INT64_MODIFIER