Index: src/OFXMLParser.m
==================================================================
--- src/OFXMLParser.m
+++ src/OFXMLParser.m
@@ -322,11 +322,11 @@
 
 		pool = [[OFAutoreleasePool alloc] init];
 		str = transform_string(cache, self);
 
 #ifdef OF_HAVE_BLOCKS
-		if (charactersHandler != nil)
+		if (charactersHandler != NULL)
 			charactersHandler(self, str);
 		else
 #endif
 			[delegate parser: self
 			 foundCharacters: str];
@@ -419,11 +419,11 @@
 							       prefix: prefix];
 
 		pool = [[OFAutoreleasePool alloc] init];
 
 #ifdef OF_HAVE_BLOCKS
-		if (elementStartHandler != nil)
+		if (elementStartHandler != NULL)
 			elementStartHandler(self, name, prefix, ns, nil);
 		else
 #endif
 			[delegate parser: self
 			 didStartElement: name
@@ -431,11 +431,11 @@
 			       namespace: ns
 			      attributes: nil];
 
 		if (buf[*i] == '/') {
 #ifdef OF_HAVE_BLOCKS
-			if (elementEndHandler != nil)
+			if (elementEndHandler != NULL)
 				elementEndHandler(self, name, prefix, ns);
 			else
 #endif
 				[delegate parser: self
 				   didEndElement: name
@@ -512,11 +512,11 @@
 							  prefix: prefix];
 
 	pool = [[OFAutoreleasePool alloc] init];
 
 #ifdef OF_HAVE_BLOCKS
-	if (elementEndHandler != nil)
+	if (elementEndHandler != NULL)
 		elementEndHandler(self, name, prefix, ns);
 	else
 #endif
 		[delegate parser: self
 		   didEndElement: name
@@ -570,11 +570,11 @@
 		resolve_attr_namespace(attrs_c[j], prefix, ns, namespaces, isa);
 
 	pool = [[OFAutoreleasePool alloc] init];
 
 #ifdef OF_HAVE_BLOCKS
-	if (elementStartHandler != nil)
+	if (elementStartHandler != NULL)
 		elementStartHandler(self, name, prefix, ns, attrs);
 	else
 #endif
 		[delegate parser: self
 		 didStartElement: name
@@ -582,11 +582,11 @@
 		       namespace: ns
 		      attributes: attrs];
 
 	if (buf[*i] == '/') {
 #ifdef OF_HAVE_BLOCKS
-		if (elementEndHandler != nil)
+		if (elementEndHandler != NULL)
 			elementEndHandler(self, name, prefix, ns);
 		else
 #endif
 			[delegate parser: self
 			   didEndElement: name
@@ -866,11 +866,11 @@
 
 	[cdata removeCharactersFromIndex: len - 2
 				 toIndex: len];
 
 #ifdef OF_HAVE_BLOCKS
-	if (CDATAHandler != nil)
+	if (CDATAHandler != NULL)
 		CDATAHandler(self, cdata);
 	else
 #endif
 		[delegate parser: self
 		      foundCDATA: cdata];
@@ -933,11 +933,11 @@
 
 	[comment removeCharactersFromIndex: len - 2
 				   toIndex: len];
 
 #ifdef OF_HAVE_BLOCKS
-	if (commentHandler != nil)
+	if (commentHandler != NULL)
 		commentHandler(self, comment);
 	else
 #endif
 		[delegate parser: self
 		    foundComment: comment];
@@ -952,11 +952,11 @@
 
 -	   (OFString*)string: (OFString*)string
   containsUnknownEntityNamed: (OFString*)entity
 {
 #ifdef OF_HAVE_BLOCKS
-	if (unknownEntityHandler != nil)
+	if (unknownEntityHandler != NULL)
 		return unknownEntityHandler(self, entity);
 #endif
 
 	return [delegate parser: self
 	foundUnknownEntityNamed: entity];