aboutsummaryrefslogtreecommitdiffstats
path: root/nanohttp.c
diff options
context:
space:
mode:
authorDaniel Veillard <veillard@src.gnome.org>2008-08-29 12:43:40 +0000
committerDaniel Veillard <veillard@src.gnome.org>2008-08-29 12:43:40 +0000
commitcba68396ac4351a5c4451c483c3343a800d71beb (patch)
tree1edb7fb2c8fc3d101bf79a7861cc5b214cb083f8 /nanohttp.c
parent0161e638c697890020c410dbedec9bb516d0fe49 (diff)
downloadandroid_external_libxml2-cba68396ac4351a5c4451c483c3343a800d71beb.tar.gz
android_external_libxml2-cba68396ac4351a5c4451c483c3343a800d71beb.tar.bz2
android_external_libxml2-cba68396ac4351a5c4451c483c3343a800d71beb.zip
a couple more fixes patch from Andreas Färber to compile on Haiku
* parser.c: a couple more fixes * nanohttp.c nanoftp.c: patch from Andreas Färber to compile on Haiku * doc/examples/*: regenerated daniel svn path=/trunk/; revision=3784
Diffstat (limited to 'nanohttp.c')
-rw-r--r--nanohttp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/nanohttp.c b/nanohttp.c
index 07829c7f..9001ae55 100644
--- a/nanohttp.c
+++ b/nanohttp.c
@@ -95,7 +95,7 @@
* A couple portability macros
*/
#ifndef _WINSOCKAPI_
-#ifndef __BEOS__
+#if !defined(__BEOS__) || defined(__HAIKU__)
#define closesocket(s) close(s)
#endif
#define SOCKET int
@@ -844,7 +844,7 @@ xmlNanoHTTPConnectAttempt(struct sockaddr *addr)
status = ioctl(s, FIONBIO, &enable);
}
#else /* VMS */
-#if defined(__BEOS__)
+#if defined(__BEOS__) && !defined(__HAIKU__)
{
bool noblock = true;
status = setsockopt(s, SOL_SOCKET, SO_NONBLOCK, &noblock, sizeof(noblock));