MAPI32 - headers

[Alexandre Julliard]

Jon Griffiths <jon_p_griffiths at yahoo.com> writes:

> -#ifndef MAPICODE_H
> -#define MAPICODE_H
> +#ifndef __WINE_MAPICODE_H
> +#define __WINE_MAPICODE_H

It's better to keep the same defines as Windows, especially since in
that case they are used from other headers.

> -#define MAKE_MAPI_SCODE(sev,fac,code) \
> -    ( (((ULONG)(sev)<<31) | ((ULONG)(fac)<<16) | ((ULONG)(code))) )

MAKE_MAPI_SCODE and the other macros are in the Windows header so we
need them, you can't remove them.

> +#ifndef __FLAGS
> +#define __FLAGS
> +typedef unsigned long  FLAGS;
> +#endif

There is no such #ifdef in the Windows header. If there are
conflicting typedefs in the Windows headers then we want conflicts in
the Wine headers too, otherwise we won't be able to build the Wine
code against the Windows headers.

-- 
Alexandre Julliard
julliard at winehq.org