On 12/7/2015 3:08 PM, Gisle Vanem wrote:
Ray Satiro wrote:

I did have a reject in socket.c with this second patch
Which socket.c? I'm not sure what reject this is.

Oops, I meant the socket macro in memdebug.h. This was the problem:

--- a/lib/memdebug.h 2015-12-07 12:59:31
+++ b/lib/memdebug.h 2015-03-25 23:39:26
@@ -103,7 +103,6 @@
 #  endif
 #endif

-#undef socket
 #define socket(domain,type,protocol)\
  curl_socket(domain, type, protocol, __LINE__, __FILE__)
 #undef accept /* for those with accept as a macro */


On the same issue; more warnings crept up using GCC 5.1 (TDM-MinGW)
while building with '-DUSE_LWIPSOCK':

In file included from curl_config.h:6:0,
                  from curl_setup.h:41,
                  from amigaos.c:23:
config-win32.h:630:5: warning: "HAVE_WINSOCK2_H" is not defined [-Wundef]
  #if HAVE_WINSOCK2_H && defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600)
      ^

I think it's more correct to say:

--- a/config-win32.h 2015-10-12 18:29:24
+++ b/config-win32.h 2015-12-07 15:46:38
@@ -627,7 +627,7 @@
  /* Define if struct sockaddr_in6 has the sin6_scope_id member. */
  #define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1

-#if HAVE_WINSOCK2_H && defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600)
+#if defined(HAVE_WINSOCK2_H) && defined(_WIN32_WINNT) && (_WIN32_WINNT >= 
0x0600)
  #define HAVE_STRUCT_POLLFD 1
  #endif

---

I see nowhere where 'HAVE_WINSOCK2_H' is defined with a value != 1.
What do you think?


Yup, the header symbols could be undefined. Thanks, landed in https://github.com/bagder/curl/commit/6c2a10e

-------------------------------------------------------------------
List admin: http://cool.haxx.se/list/listinfo/curl-library
Etiquette:  http://curl.haxx.se/mail/etiquette.html

Reply via email to