aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2004-10-09 22:57:43 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2004-10-09 22:57:43 +0000
commit6d46bf8ae368937ef65187623be9831a4ad0b1b4 (patch)
tree0d2a422cf0fb50e1a5237c2fc189a972de6d839a
parent032a8c9e35e44b6e6d690e48ddc8429d12bc58e7 (diff)
win32 fix
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1113 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--slirp/slirp.h1
-rw-r--r--slirp/tftp.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/slirp/slirp.h b/slirp/slirp.h
index 964d5e19b7..fb55ad9c32 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -33,6 +33,7 @@ typedef char *caddr_t;
#else
# define ioctlsocket ioctl
# define closesocket(s) close(s)
+# define O_BINARY 0
#endif
#include <sys/types.h>
diff --git a/slirp/tftp.c b/slirp/tftp.c
index 90526625c0..c9946d6bf2 100644
--- a/slirp/tftp.c
+++ b/slirp/tftp.c
@@ -103,7 +103,7 @@ static int tftp_read_data(struct tftp_session *spt, u_int16_t block_nr,
int fd;
int bytes_read = 0;
- fd = open(spt->filename, O_RDONLY);
+ fd = open(spt->filename, O_RDONLY | O_BINARY);
if (fd < 0) {
return -1;