diff options
author | Gabor Greif <ggreif@gmail.com> | 2017-03-27 13:33:49 +0200 |
---|---|---|
committer | Gabor Greif <ggreif@gmail.com> | 2017-03-27 13:33:49 +0200 |
commit | a6675a93efe7cae2f206508047a39e73ce4e92a5 (patch) | |
tree | a2ebec619c04d0ec90491cbd69f134ccade7abaf /rts | |
parent | d819e416a2a537b78b2698dfe753aa68dfb8b837 (diff) | |
download | haskell-a6675a93efe7cae2f206508047a39e73ce4e92a5.tar.gz |
Don't redefine typedef names
instead define the structs referred to by
- SectionFormatInfo
- ObjectCodeFormatInfo
that were only forward-declared earlier.
This fixes redefinition errors with gcc4.4
Diffstat (limited to 'rts')
-rw-r--r-- | rts/LinkerInternals.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rts/LinkerInternals.h b/rts/LinkerInternals.h index 2217c5e61b..16fbab2b29 100644 --- a/rts/LinkerInternals.h +++ b/rts/LinkerInternals.h @@ -318,12 +318,12 @@ char *cstring_from_section_name( || defined(dragonfly_HOST_OS) || defined(netbsd_HOST_OS) \ || defined(openbsd_HOST_OS) || defined(gnu_HOST_OS) # define OBJFORMAT_ELF -typedef struct _ObjectCodeFormatInfo { void* placeholder;} ObjectCodeFormatInfo; -typedef struct _SectionFormatInfo { void* placeholder; } SectionFormatInfo; +struct _SectionFormatInfo { void* placeholder; }; +struct _ObjectCodeFormatInfo { void* placeholder; }; #elif defined (mingw32_HOST_OS) # define OBJFORMAT_PEi386 -typedef struct _ObjectCodeFormatInfo { void* placeholder;} ObjectCodeFormatInfo; -typedef struct _SectionFormatInfo { void* placeholder; } SectionFormatInfo; +struct _SectionFormatInfo { void* placeholder; }; +struct _ObjectCodeFormatInfo { void* placeholder; }; #elif defined(darwin_HOST_OS) || defined(ios_HOST_OS) # define OBJFORMAT_MACHO # include "linker/MachOTypes.h" |