summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Warmerdam <warmerdam@pobox.com>2005-07-28 13:48:32 +0000
committerFrank Warmerdam <warmerdam@pobox.com>2005-07-28 13:48:32 +0000
commit3e535984979d7cf08ce111a9e55f8663a773ef97 (patch)
tree1094dbb8c0fc0192306191dae2407ab1179351a1
parentf185e927733465e1d90f8d3a7441d72b5733476e (diff)
downloadlibtiff-git-3e535984979d7cf08ce111a9e55f8663a773ef97.tar.gz
return char * from _TIFFCheckMalloc to match prototype
-rw-r--r--libtiff/tif_aux.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libtiff/tif_aux.c b/libtiff/tif_aux.c
index 721d73bb..4a08deae 100644
--- a/libtiff/tif_aux.c
+++ b/libtiff/tif_aux.c
@@ -1,4 +1,4 @@
-/* $Id: tif_aux.c,v 1.10 2005-07-28 12:05:45 dron Exp $ */
+/* $Id: tif_aux.c,v 1.11 2005-07-28 13:48:32 fwarmerdam Exp $ */
/*
* Copyright (c) 1991-1997 Sam Leffler
@@ -33,7 +33,7 @@
#include "tif_predict.h"
#include <math.h>
-tdata_t
+char *
_TIFFCheckMalloc(TIFF* tif, size_t nmemb, size_t elem_size, const char* what)
{
tdata_t *cp = NULL;