cvs: php4 /ext/exif exif.c

helly Mon Dec 16 10:53:47 2002 EDT Modified files: /php4/ext/exif exif.c Log: fix compiler definition tests Index: php4/ext/exif/exif.c diff -u php4/ext/exif/exif.c:1.132 php4/ext/exif/exif.c:1.133 --- php4/ext/exif/exif.c:1.132 Mon Dec 16 09:47:59 2002 +++ php4/ext/exif/exif.c Mon Dec 16 10:53:46 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.132 2002/12/16 14:47:59 helly Exp $ */ +/* $Id: exif.c,v 1.133 2002/12/16 15:53:46 helly Exp $ */ /* ToDos * @@ -64,7 +64,7 @@ #define EXIF_USE_MBSTRING 0 #endif -#ifdef EXIF_USE_MBSTRING +#if EXIF_USE_MBSTRING #include "ext/mbstring/mbstring.h" #endif @@ -95,7 +95,7 @@ }; /* }}} */ -#define EXIF_VERSION "1.4 $Id: exif.c,v 1.132 2002/12/16 14:47:59 helly Exp $" +#define EXIF_VERSION "1.4 $Id: exif.c,v 1.133 2002/12/16 15:53:46 helly Exp $" /* {{{ PHP_MINFO_FUNCTION */ @@ -132,7 +132,7 @@ ZEND_API ZEND_INI_MH(OnUpdateEncode) { -#ifdef EXIF_USE_MBSTRING +#if EXIF_USE_MBSTRING if (new_value && strlen(new_value) && !php_mb_check_encoding_list(new_value TSRMLS_CC)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Illegal encoding ignored: '%s'", new_value); return FAILURE; @@ -143,7 +143,7 @@ ZEND_API ZEND_INI_MH(OnUpdateDecode) { -#ifdef EXIF_USE_MBSTRING +#if EXIF_USE_MBSTRING if (!php_mb_check_encoding_list(new_value TSRMLS_CC)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Illegal encoding ignored: '%s'", new_value); return FAILURE; @@ -2582,7 +2582,7 @@ { int a; -#ifdef EXIF_USE_MBSTRING +#if EXIF_USE_MBSTRING char *decode; size_t len;; #endif @@ -2594,7 +2594,7 @@ *pszEncoding = estrdup((const char*)szValuePtr); szValuePtr = szValuePtr+8; ByteCount -= 8; -#ifdef EXIF_USE_MBSTRING +#if EXIF_USE_MBSTRING /* First try to detect BOM: ZERO WIDTH NOBREAK SPACE (FEFF 16) * since we have no encoding support for the BOM yet we skip that. */ @@ -2627,7 +2627,7 @@ *pszEncoding = estrdup((const char*)szValuePtr); szValuePtr = szValuePtr+8; ByteCount -= 8; -#ifdef EXIF_USE_MBSTRING +#if EXIF_USE_MBSTRING if (ImageInfo->motorola_intel) { *pszInfoPtr = php_mb_convert_encoding(szValuePtr, ByteCount, ImageInfo->encode_jis, ImageInfo->decode_jis_be, &len TSRMLS_CC); } else { @@ -2666,7 +2666,7 @@ xp_field->tag = tag; /* Copy the comment */ -#ifdef EXIF_USE_MBSTRING +#if EXIF_USE_MBSTRING /* What if MS supports big-endian with XP? */ /* if (ImageInfo->motorola_intel) { xp_field->value = php_mb_convert_encoding(szValuePtr, ByteCount, ImageInfo->encode_unicode, ImageInfo->decode_unicode_be, &xp_field->size TSRMLS_CC);