Re: include: Add missing definitions in af_irda.h. (try 2)

[Alexandre Julliard]

Thomas Trummer <th.trummer(a)gmail.com> writes:
> @@ -97,4 +100,159 @@ typedef struct _SOCKADDR_IRDA
>  #define LmCharSetISO_8859_9 0x09
>  #define LmCharSetUNICODE    0xff
>
> +#define SIO_LAZY_DISCOVERY  _IOR('t', 127, ULONG)
> +
> +#define WINDOWS_AF_IRDA                       26
> +#define WINDOWS_PF_IRDA          WINDOWS_AF_IRDA
> +
> +#define WCE_AF_IRDA                           22
> +#define WCE_PF_IRDA                  WCE_AF_IRDA
> +
> +#ifndef AF_IRDA
> +#define AF_IRDA                  WINDOWS_AF_IRDA
> +#endif
> +
> +#ifndef PF_IRDA
> +#define PF_IRDA                          AF_IRDA
> +#endif
> +
> +#define IRDA_PROTO_SOCK_STREAM                 1

You need a WS prefix on all definitions that can conflict with Unix.

-- 
Alexandre Julliard
julliard(a)winehq.org

include: Add missing definitions in af_irda.h. (try 2)

[Thomas Trummer]

Thanks for looking at the patch.

1) Is there a way to ensure that it doesn't conflict with other symbols?
I've created a small test program that includes the Linux Irda headers which
works fine for Linux but I have no idea about the Mac...

2) About the AF_IRDA et al. symbols: These are already defined in the
winsock headers, so there are two options: Remove them and include the
winsock header (this would also get rid of the USE_WS macros) or leave them
in and add the WS_ prefix appropriately. I would create a new version of the
patch accordingly...

Tom

2009/8/29 Alexandre Julliard <julliard(a)winehq.org>
> Thomas Trummer <th.trummer(a)gmail.com> writes:
> > @@ -97,4 +100,159 @@ typedef struct _SOCKADDR_IRDA
> >  #define LmCharSetISO_8859_9 0x09
> >  #define LmCharSetUNICODE    0xff
> >
> > +#define SIO_LAZY_DISCOVERY  _IOR('t', 127, ULONG)
> > +
> > +#define WINDOWS_AF_IRDA                       26
> > +#define WINDOWS_PF_IRDA          WINDOWS_AF_IRDA
> > +
> > +#define WCE_AF_IRDA                           22
> > +#define WCE_PF_IRDA                  WCE_AF_IRDA
> > +
> > +#ifndef AF_IRDA
> > +#define AF_IRDA                  WINDOWS_AF_IRDA
> > +#endif
> > +
> > +#ifndef PF_IRDA
> > +#define PF_IRDA                          AF_IRDA
> > +#endif
> > +
> > +#define IRDA_PROTO_SOCK_STREAM                 1
>
> You need a WS prefix on all definitions that can conflict with Unix.
>
> --
> Alexandre Julliard
> julliard(a)winehq.org

include: Add missing definitions in af_irda.h. (try 2)

[James McKenzie]

Thomas Trummer wrote:
> Thanks for looking at the patch.
>
> 1) Is there a way to ensure that it doesn't conflict with other
> symbols? I've created a small test program that includes the Linux
> Irda headers which works fine for Linux but I have no idea about the
> Mac...
>
> 2) About the AF_IRDA et al. symbols: These are already defined in the
> winsock headers, so there are two options: Remove them and include the
> winsock header (this would also get rid of the USE_WS macros) or leave
> them in and add the WS_ prefix appropriately. I would create a new
> version of the patch accordingly...
>
> Tom
>
> 2009/8/29 Alexandre Julliard <julliard(a)winehq.org
> <mailto:julliard(a)winehq.org>>
>
> Thomas Trummer <th.trummer(a)gmail.com
>     <mailto:th.trummer(a)gmail.com>> writes:
>
> > @@ -97,4 +100,159 @@ typedef struct _SOCKADDR_IRDA
>     >  #define LmCharSetISO_8859_9 0x09
>     >  #define LmCharSetUNICODE    0xff
>     >
>     > +#define SIO_LAZY_DISCOVERY  _IOR('t', 127, ULONG)
>     > +
>     > +#define WINDOWS_AF_IRDA                       26
>     > +#define WINDOWS_PF_IRDA          WINDOWS_AF_IRDA
>     > +
>     > +#define WCE_AF_IRDA                           22
>     > +#define WCE_PF_IRDA                  WCE_AF_IRDA
>     > +
>     > +#ifndef AF_IRDA
>     > +#define AF_IRDA                  WINDOWS_AF_IRDA
>     > +#endif
>     > +
>     > +#ifndef PF_IRDA
>     > +#define PF_IRDA                          AF_IRDA
>     > +#endif
>     > +
>     > +#define IRDA_PROTO_SOCK_STREAM                 1
>
> You need a WS prefix on all definitions that can conflict with Unix.

As a Mac user, it might just be better to use WS_ for all Wine symbols
unless they are specific to Windows and we have to use their calling
convention to make programs work.

James McKenzie

include: Add missing definitions in af_irda.h. (try 2)

[Alexandre Julliard]

Thomas Trummer <th.trummer(a)gmail.com> writes:
> Thanks for looking at the patch.
>
> 1) Is there a way to ensure that it doesn't conflict with other symbols?
> I've created a small test program that includes the Linux Irda headers which
> works fine for Linux but I have no idea about the Mac...

Grep for each symbol in the system headers. Trying a build is not
enough.
> 2) About the AF_IRDA et al. symbols: These are already defined in the
> winsock headers, so there are two options: Remove them and include the
> winsock header (this would also get rid of the USE_WS macros) or leave them
> in and add the WS_ prefix appropriately. I would create a new version of the
> patch accordingly...

You can't include winsock.h, that's not what Windows does.

-- 
Alexandre Julliard
julliard(a)winehq.org

include: Add missing definitions in af_irda.h. (try 2)

[Juan Lang]

Hi Thomas,
> I've created a small test program that includes the Linux Irda headers which
> works fine for Linux but I have no idea about the Mac...

There's no IRDA support on the Mac, hence no header conflict to worry about.
--Juan