25 mar 2013 kl. 05.42 skrev Branko Čibej:

I'm not too happy with this patch because the hack is not restricted to only those versions of OS X that actually need it. It's not needed, to my knowledge, at least since 10.6; the latest version of that header uses __inline rather than inline, which apparently all recent Apple compilers support (and, AFAIK, gcc has supported since before OS X existed).

That is unlikely to be a problem, since the headers would only be affected if they used inline, but if they did they would get in trouble with -std=c89, which according to you they don't - QED.
However, I'm happy to oblige; new patch attached.

[[[
Work around a problem on older OS X systems: sqlite3.c includes
<libkern/OSAtomic.h>, which uses 'inline' and thus cannot be compiled
with -std=c89 that we are using for all files.

* subversion/libsvn_subr/sqlite3wrapper.c
(toplevel): Define 'inline' as '__inline__' (which gcc accepts even in c89
   mode) during a pre-emptive inclusion of <libkern/OSAtomic.h>.
* subversion/tests/libsvn_wc/wc-queries-test.c
  (toplevel): Likewise.
]]]

Attachment: apple.patch
Description: Binary data


Reply via email to