> I applied all parts that were successfully merged, and there was only one
> part that wasn't clear to me at a quick glance how I should edit it so the
> changes to "win32/libssh2_config.h" were not committed.
>
> Can you please give the current CVS a check and see how that patch is to be
> applied?
It doesn't really matter much now that nothing uses WINSOCK_VERSION,
but here's a patch that should apply directly against CVS anyhow.
Rich.
--
Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones
virt-top is 'top' for virtual machines. Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://et.redhat.com/~rjones/virt-top
Index: win32/libssh2_config.h
===================================================================
RCS file: /cvsroot/libssh2/libssh2/win32/libssh2_config.h,v
retrieving revision 1.10
diff -u -r1.10 libssh2_config.h
--- win32/libssh2_config.h 30 Sep 2008 21:54:21 -0000 1.10
+++ win32/libssh2_config.h 10 Nov 2008 17:36:09 -0000
@@ -12,10 +12,6 @@
#define HAVE_UNISTD_H
#define HAVE_INTTYPES_H
#define HAVE_SYS_TIME_H
-
-/* defined into MS PSDK but not into Mingw w32api */
-#define WINSOCK_VERSION MAKEWORD(2,0)
-
#endif
#define HAVE_WINSOCK2_H
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
libssh2-devel mailing list
libssh2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/libssh2-devel
