[PATCH 1/2] ntdll: Support 64-bit Mac OS. (try 2)

[Alexandre Julliard]

Charles Davis <cdavis5x at gmail.com> writes:

> +/**********************************************************************
> + *              NtCurrentTeb  (NTDLL.@)
> + *
> + * FIXME: This isn't exported from NTDLL on real NT.  This should be
> + *        removed if and when we can set the GSBASE MSR on Mac OS X.
> + */
> +TEB * WINAPI NtCurrentTeb(void)
> +{
> +#ifdef __APPLE__
> +    return pthread_getspecific( teb_key );
> +#elif defined(__GNUC__)
> +    struct _TEB *teb;
> +    __asm__(".byte 0x65\n\tmovq (0x30),%0" : "=r" (teb));
> +    return teb;
> +#else
> +# error Please define retrieving the current TEB for your platform
> +#endif
> +}

You can't do it that way:

../../../wine/dlls/ntdll/signal_x86_64.c:3481:31: error: redefinition of ‘NtCurrentTeb’
In file included from ../../../wine/include/windef.h:258:0,
                 from ../../../wine/dlls/ntdll/signal_x86_64.c:59:
../../../wine/include/winnt.h:2288:84: note: previous definition of ‘NtCurrentTeb’ was here

-- 
Alexandre Julliard
julliard at winehq.org