431100 - Dehydra Mac port broken (header conflicts) introduced by changeset 235:9a125440ef7d

Status: RESOLVED FIXED

(Developer Infrastructure :: Source Code Analysis, defect)

Description

[Vlad Sukhoy]

An attempt to build dehydra with most recent trunk produces the following error:

In file included from /Users/sukhoy/Mozilla/gcc-dehydra/gcc/gcc/system.h:533,
                 from dehydra.c:8:
/Users/sukhoy/Mozilla/gcc-dehydra/gcc/gcc/../include/libiberty.h:101: error: conflicting types for ‘basename’
/usr/include/libgen.h:40: error: previous declaration of ‘basename’ was here

Comment 1

[Vlad Sukhoy]

Attachment: proposed patch

Comment 2

[(dormant account)]

Vlad can this not be done in cp-tree-jsapi-workaround.h?

Comment 3

[(dormant account)]

(In reply to comment #1)
> Created an attachment (id=318076) [details]
> proposed patch
> 

also while we are doing ugly code, why not just do a forward decl of dirname with a comment explaining why we do things that way?

Comment 4

[Vlad Sukhoy]

Technically this is not a conflict between JS and GCC :( It looks like a  problem with Apple gcc configure, the prototypes of basename in libiberty.h and in system header libgen.h are different (one has const and another does not) and libgen.h is not used at all, it seems, when building gcc, so configure doesn't see declaration from libgen.h and does not define the macro that turns off libiberty.h's declaration appropriately.

We could put this stuff in that file, but it would be no longer be just a "cp-tree VS jsapi workaround", but a collection of different mac workarounds, so we'd probably have to at least rename the file, I guess.

Comment 5

[Vlad Sukhoy]

Forward decl would work given that we take out libgen.h include.

Comment 6

[(dormant account)]

I'll just get rid of dirname

Comment 7

[(dormant account)]

Attachment: manual dirname

Comment 8

[(dormant account)]

pushed