Merge branch 'js/poll-emu'
authorJunio C Hamano <gitster@pobox.com>
Tue, 25 Sep 2012 17:40:18 +0000 (10:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 25 Sep 2012 17:40:18 +0000 (10:40 -0700)
* js/poll-emu:
make poll() work on platforms that can't recv() on a non-socket
poll() exits too early with EFAULT if 1st arg is NULL
fix some win32 specific dependencies in poll.c
make poll available for other platforms lacking it

1  2 
Makefile
diff --cc Makefile
Simple merge