diff options
| author | Rahul Chaudhry <rahulchaudhry@google.com> | 2018-03-27 20:08:37 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-03-27 20:08:37 +0000 |
| commit | 84b4ff1398235c86142791841eb34c8f19129b2e (patch) | |
| tree | 8881cba66123f00b5bd3ce467d83151bf4db2214 | |
| parent | 369ca62c8ad571067698b8113580315fa63eb190 (diff) | |
| parent | 19df9bb8a21642ab6bd44cee72528bf468c7cd20 (diff) | |
| download | binutils-84b4ff1398235c86142791841eb34c8f19129b2e.tar.gz | |
gold: fix build errors on darwin. am: b415c49e4c
am: 19df9bb8a2
Change-Id: I7d0adc629592f7785b44ea20fbedac0d53f50ee5
| -rw-r--r-- | binutils-2.27/gold/gold.h | 2 | ||||
| -rw-r--r-- | binutils-2.27/gold/output.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/binutils-2.27/gold/gold.h b/binutils-2.27/gold/gold.h index c75bc7f2..3d7ac083 100644 --- a/binutils-2.27/gold/gold.h +++ b/binutils-2.27/gold/gold.h @@ -32,9 +32,11 @@ #include <stdint.h> #include <sys/types.h> +#ifndef __STDC_FORMAT_MACROS // __STDC_FORMAT_MACROS is needed to turn on macros in <inttypes.h>. #define __STDC_FORMAT_MACROS #include <inttypes.h> +#endif #include "system.h" diff --git a/binutils-2.27/gold/output.h b/binutils-2.27/gold/output.h index f4b8e5eb..ee109f00 100644 --- a/binutils-2.27/gold/output.h +++ b/binutils-2.27/gold/output.h @@ -27,9 +27,11 @@ #include <list> #include <vector> +#ifndef __STDC_FORMAT_MACROS // __STDC_FORMAT_MACROS is needed to turn on macros in <inttypes.h>. #define __STDC_FORMAT_MACROS #include <inttypes.h> +#endif #include "elfcpp.h" #include "mapfile.h" |