diff options
| author | Chris Lattner <sabre@nondot.org> | 2004-11-03 17:15:45 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2004-11-03 17:15:45 +0000 |
| commit | f305b0ae1b34bf3aab2c4f861d0717c7f4048f4c (patch) | |
| tree | 7675ac744e0108fa44010161c10c65962b2021bd /llvm | |
| parent | 1845e9b4c7ed91694b23ea9acf4019baf9e37e7a (diff) | |
| download | bcm5719-llvm-f305b0ae1b34bf3aab2c4f861d0717c7f4048f4c.tar.gz bcm5719-llvm-f305b0ae1b34bf3aab2c4f861d0717c7f4048f4c.zip | |
defining __STDC_LIMIT_MACROS on the command line is not really necessary
for Visual Studio, and is a bit of a pain when you want to include the
LLVM headers from your own project, so I moved the check a bit down into
the Unix case to avoid the hassle... Here is a patch
Patch by Morten Ofstad!
llvm-svn: 17450
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/include/llvm/Support/DataTypes.h.in | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/llvm/include/llvm/Support/DataTypes.h.in b/llvm/include/llvm/Support/DataTypes.h.in index 4fc2d079ae4..d5d1fc697af 100644 --- a/llvm/include/llvm/Support/DataTypes.h.in +++ b/llvm/include/llvm/Support/DataTypes.h.in @@ -23,6 +23,12 @@ #include "llvm/Config/config.h" +#undef HAVE_SYS_TYPES_H +#undef HAVE_INTTYPES_H +#undef HAVE_STDINT_H + +#ifndef _MSC_VER + // Note that this header's correct operation depends on __STDC_LIMIT_MACROS // being defined. We would define it here, but in order to prevent Bad Things // happening when system headers or C++ STL headers include stdint.h before @@ -31,11 +37,6 @@ # error "Must #define __STDC_LIMIT_MACROS before #including Support/DataTypes.h" #endif -#undef HAVE_SYS_TYPES_H -#undef HAVE_INTTYPES_H -#undef HAVE_STDINT_H - -#ifndef _MSC_VER // Note that <inttypes.h> includes <stdint.h>, if this is a C99 system. #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> |
