diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2021-07-04 08:59:31 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2021-07-04 08:59:31 +0000 |
| commit | cdfbb3c2a46c3277241b3ccf0172be977701fd4a (patch) | |
| tree | bf0e9536ea04c9846e8026bde8f4e36db1008cfa | |
| parent | f3c5eea002a6257996319c6398beab5c63fb316b (diff) | |
| parent | 4d9ed169f5b8a2ebd7cb0bdf02de6930393603f7 (diff) | |
| download | slirp-cdfbb3c2a46c3277241b3ccf0172be977701fd4a.zip slirp-cdfbb3c2a46c3277241b3ccf0172be977701fd4a.tar.gz slirp-cdfbb3c2a46c3277241b3ccf0172be977701fd4a.tar.bz2 | |
Merge branch 'master' into 'master'
Fix for Haiku
See merge request slirp/libslirp!98
| -rw-r--r-- | src/slirp.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/slirp.h b/src/slirp.h index e669383..89d79f3 100644 --- a/src/slirp.h +++ b/src/slirp.h @@ -20,10 +20,8 @@ #include <iphlpapi.h> #else -#if !defined(__HAIKU__) #define O_BINARY 0 #endif -#endif #ifndef _WIN32 #include <sys/uio.h> |