2010/4/20, Ruslan Gazizov wrote: > Here is suggested patch - > -------------- > diff -ur curl/lib/Makefile.vc6 curlmod/lib/Makefile.vc6 > --- curl/lib/Makefile.vc6 2010-04-16 23:46:26.879000000 +0600 > +++ curlmod/lib/Makefile.vc6 2010-04-20 15:35:22.482000000 +0600 > @@ -101,7 +101,7 @@ > SSLLIBS = libeay32.lib ssleay32.lib > ZLIBLIBSDLL= zdll.lib > ZLIBLIBS = zlib.lib > -WINLIBS = wsock32.lib wldap32.lib > +WINLIBS = ws2_32.lib wldap32.lib > CFLAGS = $(CFLAGS) > > CFGSET = FALSE
+1 to replace wsock32.lib with ws2_32.lib in all MSVC makefiles. IOW, ok to replace 'wsock32.lib' string with 'ws2_32.lib' string in following three files: lib/Makefile.vc6 src/Makefile.vc6 and Makefile.dist libcurl's MSVC project files have been using ws2_32.lib instead of wsock32.lib for a long time. > diff -ur curl/lib/config-win32.h curlmod/lib/config-win32.h > --- curl/lib/config-win32.h 2010-04-07 16:57:26.674085100 +0600 > +++ curlmod/lib/config-win32.h 2010-04-20 15:35:05.481000000 +0600 > @@ -476,6 +476,12 @@ > # define HAVE_GETADDRINFO 1 > # define HAVE_GETADDRINFO_THREADSAFE 1 > # define HAVE_GETNAMEINFO 1 > +# elif > +# include <wspiapi.h> > +# define HAVE_FREEADDRINFO 1 > +# define HAVE_GETADDRINFO 1 > +# define HAVE_GETADDRINFO_THREADSAFE 1 > +# define HAVE_GETNAMEINFO 1 > # endif > #endif Funny looking hunk. Condition missing for elif statement. In any case, hunk not needed if wsock32.lib is changed to ws2_32.lib. Ruslan, can you provide updated patch? -- -=[Yang]=- ------------------------------------------------------------------- List admin: http://cool.haxx.se/list/listinfo/curl-library Etiquette: http://curl.haxx.se/mail/etiquette.html
