MFH

diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 7a11846ccf8a22c919a21d0c111b1dbcdbb506d0..28ecf73a3f3e13cc0e6fb483e03ac9230aec10a6 100644 (file)
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -64,7 +64,7 @@
 #define EXIF_USE_MBSTRING 0
 #endif
 
-#ifdef EXIF_USE_MBSTRING
+#if EXIF_USE_MBSTRING
 #include "ext/mbstring/mbstring.h"
 #endif
 
@@ -132,7 +132,7 @@ ZEND_DECLARE_MODULE_GLOBALS(exif)
 
 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(OnUpdateEncode)
 
 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;
@@ -2560,7 +2560,7 @@ static int exif_process_user_comment(image_info_type *ImageInfo, char **pszInfoP
 {
        int   a;
 
-#ifdef EXIF_USE_MBSTRING
+#if EXIF_USE_MBSTRING
        size_t len;;
 #endif
 
@@ -2571,7 +2571,7 @@ static int exif_process_user_comment(image_info_type *ImageInfo, char **pszInfoP
                        *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_unicode, ImageInfo->decode_unicode_be, &len TSRMLS_CC);
                        } else {
@@ -2592,7 +2592,7 @@ static int exif_process_user_comment(image_info_type *ImageInfo, char **pszInfoP
                        *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 {
@@ -2631,7 +2631,7 @@ static int exif_process_unicode(image_info_type *ImageInfo, xp_field_type *xp_fi
        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);