Index: src/OFStreamSocket.m
==================================================================
--- src/OFStreamSocket.m
+++ src/OFStreamSocket.m
@@ -125,11 +125,10 @@
 	if ((ret = send(sock, buf, size, 0)) == -1)
 		@throw [OFWriteFailedException newWithClass: isa
 						     stream: self
 					      requestedSize: size];
 
-	/* This is safe, as we already checked for -1 */
 	return ret;
 }
 
 #ifdef _WIN32
 - (void)setBlocking: (BOOL)enable

Index: src/OFThread.h
==================================================================
--- src/OFThread.h
+++ src/OFThread.h
@@ -26,11 +26,15 @@
  */
 @interface OFTLSKey: OFObject
 {
 @public
 	of_tlskey_t key;
+/* Work around a bug in gcc 4.4.4 (possibly only on Haiku) */
+#if !defined(__GNUC__) || __GNUC__ != 4 || __GNUC_MINOR__ != 4 || \
+    __GNUC_PATCHLEVEL__ != 4
 @protected
+#endif
 	void (*destructor)(id);
 	of_list_object_t *listobj;
 	BOOL initialized;
 }