On Apr 5, 2015, at 7:29 PM, Bruno Jesus <00cpxxx@gmail.com> wrote:

On Sun, Apr 5, 2015 at 4:07 PM, Socapex <philippe.groarke@gmail.com> wrote:
If HAS_IPX isn't defined, compilation will throw error since
WS_IPX_* aren't declared.
---
dlls/ws2_32/socket.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 09c8416..bc4d40a 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -365,6 +365,7 @@ static inline const char *debugstr_sockopt(int level, int optname)
        DEBUG_SOCKLEVEL(WS_NSPROTO_IPX);
        switch(optname)
        {
+#ifdef HAS_IPX
            DEBUG_SOCKOPT(WS_IPX_PTYPE);
            DEBUG_SOCKOPT(WS_IPX_FILTERPTYPE);
            DEBUG_SOCKOPT(WS_IPX_DSTYPE);
@@ -372,6 +373,7 @@ static inline const char *debugstr_sockopt(int level, int optname)
            DEBUG_SOCKOPT(WS_IPX_MAXSIZE);
            DEBUG_SOCKOPT(WS_IPX_ADDRESS);
            DEBUG_SOCKOPT(WS_IPX_MAX_ADAPTER_NUM);
+#endif
        }
        break;

Hi, unfortunately I don't have OSX so I only test my patches in Linux
and FreeBSD, so sometimes these problems happen, sorry. I think it's
better to simply remove the #ifdef around wsnwlink.h [1], this will
not reduce the debug capabilities of debugstr_sockopt. Since
wsnwlink.h is an internal include it will always be available, can you
it, please?

[1] From socket.c:

160 #ifdef HAS_IPX
161 # include "wsnwlink.h"
162 #endif

Best Regards,
Bruno

No problem! I wasn't sure if wsnwlink.h would cause issues. I'll resend the patch with that solution instead.