diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2010-07-10 10:08:21 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2010-07-10 10:08:21 -0700 |
| commit | 0386fa77367a305deea3cc27f8a3865cc3c467c0 (patch) | |
| tree | 96833d76bbac8e4327774f89a6b68bf4861e6fcb /src/stubs | |
| parent | 8f75706901da0141590d46f0f898e5678feac953 (diff) | |
| download | xorg-lib-libXfont-0386fa77367a305deea3cc27f8a3865cc3c467c0.tar.gz | |
darwin: Fix build regression introduced by previous patch
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Diffstat (limited to 'src/stubs')
| -rw-r--r-- | src/stubs/stubs.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/stubs/stubs.h b/src/stubs/stubs.h index 7733dc3..c721bbd 100644 --- a/src/stubs/stubs.h +++ b/src/stubs/stubs.h @@ -12,13 +12,22 @@ #endif /* this probably works for Mach-O too, but probably not for PE */ -#if defined(__ELF__) && defined(__GNUC__) && (__GNUC__ >= 3) +#if (defined(__APPLE__) || defined(__ELF__)) && defined(__GNUC__) && (__GNUC__ >= 3) #define weak __attribute__((weak)) #else #define weak #define NO_WEAK_SYMBOLS #endif +/* This is really just a hack for now... __APPLE__ really should be using + * the weak symbols route above, but it's causing an as-yet unresolved issue, + * so we're instead building with flat_namespace. + */ +#ifdef __APPLE__ +#undef weak +#define weak +#endif + extern FontPtr find_old_font ( FSID id ); extern int set_font_authorizations ( char **authorizations, int *authlen, |