Sorry - nullptr doesn't work with the default Makefile and I don't trust the rest...

diff --git a/contrib/bobtoolz/DPatch.cpp b/contrib/bobtoolz/DPatch.cpp
index 5916d7e0e961f48e1394b807a62dc43edbc48706..be49df4ef4ab9aa06f539161164e9bfce751be70 100644 (file)
--- a/contrib/bobtoolz/DPatch.cpp
+++ b/contrib/bobtoolz/DPatch.cpp
@@ -302,7 +302,7 @@ DPatch* DPatch::MergePatches( patch_merge_t merge_info, DPatch *p1, DPatch *p2 )
 
        int newHeight = p1->height + p2->height - 1;
        if ( newHeight > MAX_PATCH_HEIGHT ) {
-               return nullptr;
+               return NULL;
        }
 
        DPatch* newPatch = new DPatch();