diff options
| author |  senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-06 18:36:33 +0000 |
|---|---|---|
| committer | senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-06 18:36:33 +0000 |
| commit | f9a1455ef16aa7f67ebed3c17661f434b8512ae9 (patch) | |
| tree | c86d4d735a8ffd1b88c103f5693f28a57e830b27 | |
| parent | b13d63c4c0878a3de7230f79a7044830c93d3849 (diff) | |
Avoid re-definition of STDC symbols, needed for my ffmpeg work.
See changes to build/common.gypi in https://codereview.chromium.org/11364077/
BUG=118986, 91970
Review URL: https://codereview.appspot.com/6810088
Patch from Paweł Hajdan, Jr. <phajdan.jr@chromium.org>.
git-svn-id: http://skia.googlecode.com/svn/trunk@6313 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | include/gpu/GrConfig.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/gpu/GrConfig.h b/include/gpu/GrConfig.h index f41a1bab55..cd081eff22 100644 --- a/include/gpu/GrConfig.h +++ b/include/gpu/GrConfig.h @@ -126,8 +126,12 @@ typedef unsigned __int64 uint64_t; * macros here before anyone else has a chance to include stdint.h without * these. */ +#ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS +#endif +#ifndef __STDC_CONSTANT_MACROS #define __STDC_CONSTANT_MACROS +#endif #include <stdint.h> #endif |