Merge branch 'maint'

diff --git a/blob.c b/blob.c
index 496f270043a617242efa9d27285853feb2597484..9776beac5827a4c705eddde426817dcc40c525bc 100644 (file)
--- a/blob.c
+++ b/blob.c
@@ -1,6 +1,5 @@
 #include "cache.h"
 #include "blob.h"
-#include <stdlib.h>
 
 const char *blob_type = "blob";
 
@@ -10,12 +9,12 @@ struct blob *lookup_blob(const unsigned char *sha1)
        if (!obj) {
                struct blob *ret = alloc_blob_node();
                created_object(sha1, &ret->object);
-               ret->object.type = TYPE_BLOB;
+               ret->object.type = OBJ_BLOB;
                return ret;
        }
        if (!obj->type)
-               obj->type = TYPE_BLOB;
-       if (obj->type != TYPE_BLOB) {
+               obj->type = OBJ_BLOB;
+       if (obj->type != OBJ_BLOB) {
                error("Object %s is a %s, not a blob",
                      sha1_to_hex(sha1), typename(obj->type));
                return NULL;