cvs: php4(PHP_4_3) /ext/exif exif.c

helly Mon Dec 16 12:53:15 2002 EDT Modified files: (Branch: PHP_4_3) /php4/ext/exif exif.c Log: MFH Index: php4/ext/exif/exif.c diff -u php4/ext/exif/exif.c:1.118.2.10 php4/ext/exif/exif.c:1.118.2.11 --- php4/ext/exif/exif.c:1.118.2.10 Mon Dec 16 10:54:04 2002 +++ php4/ext/exif/exif.c Mon Dec 16 12:53:15 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.118.2.10 2002/12/16 15:54:04 helly Exp $ */ +/* $Id: exif.c,v 1.118.2.11 2002/12/16 17:53:15 helly Exp $ */ /* ToDos * @@ -95,7 +95,7 @@ }; /* }}} */ -#define EXIF_VERSION "1.4 $Id: exif.c,v 1.118.2.10 2002/12/16 15:54:04 helly Exp $" +#define EXIF_VERSION "1.4 $Id: exif.c,v 1.118.2.11 2002/12/16 17:53:15 helly Exp $" /* {{{ PHP_MINFO_FUNCTION */ @@ -2514,7 +2514,7 @@ /* {{{ exif_process_string_raw * Copy a string in Exif header to a character string returns length of allocated buffer if any. */ -#ifndef EXIF_USE_MBSTRING +#if !EXIF_USE_MBSTRING static int exif_process_string_raw(char **result, char *value, size_t byte_count) { /* we cannot use strlcpy - here the problem is that we have to copy NUL * chars up to byte_count, we also have to add a single NUL character to