Greg Turner <[EMAIL PROTECTED]> writes:

> diff -ur -x CVS -x 'bigdif*' ../wine.test/dlls/rpcrt4/rpc_binding.c 
>./dlls/rpcrt4/rpc_binding.c
> --- ../wine.test/dlls/rpcrt4/rpc_binding.c    2002-10-29 12:59:02.000000000 -0600
> +++ ./dlls/rpcrt4/rpc_binding.c       2002-10-29 13:28:39.000000000 -0600
> @@ -865,14 +865,21 @@
>   *  Exists in win9x and winNT, but with different number of arguments
>   *  (9x version has 3 arguments, NT has 2).
>   */
> +#ifdef WINNT
> +RPC_STATUS WINAPI I_RpcBindingSetAsync( RPC_BINDING_HANDLE Binding, RPC_BLOCKING_FN 
>BlockingFn)
> +#else
>  RPC_STATUS WINAPI I_RpcBindingSetAsync( RPC_BINDING_HANDLE Binding, RPC_BLOCKING_FN 
>BlockingFn, unsigned long ServerTid )
> +#endif
>  {

This can't work, we are not going to build two versions of Wine with
different #ifdefs. We should simply decide which version we support
(NT would probably be preferable) and get rid of the #ifdefs in the
header.

-- 
Alexandre Julliard
[EMAIL PROTECTED]

Reply via email to