Fix [-Wundef] warning in FileInfo extension

Author: Girgias

ext/fileinfo/libmagic.patch

@@ -1062,7 +1062,7 @@ diff -u libmagic.orig/buffer.c libmagic/buffer.c
 
 diff -u libmagic.orig/cdf.c libmagic/cdf.c
 --- libmagic.orig/cdf.c	2019-02-20 03:35:27.000000000 +0100
-+++ libmagic/cdf.c	2020-04-07 22:25:10.517321000 +0200
++++ libmagic/cdf.c	2020-05-05 20:05:37.698461100 +0200
 @@ -43,7 +43,17 @@
  #include <err.h>
  #endif
@@ -1395,7 +1395,7 @@ diff -u libmagic.orig/cdf_time.c libmagic/cdf_time.c
  	(void)snprintf(buf, 26, "*Bad* %#16.16" INT64_T_FORMAT "x\n",
 diff -u libmagic.orig/compress.c libmagic/compress.c
 --- libmagic.orig/compress.c	2019-05-07 04:27:11.000000000 +0200
-+++ libmagic/compress.c	2020-04-07 22:25:10.517321000 +0200
++++ libmagic/compress.c	2020-05-20 18:00:58.381264900 +0200
 @@ -45,13 +45,11 @@
  #endif
  #include <string.h>
@@ -1437,6 +1437,15 @@ diff -u libmagic.orig/compress.c libmagic/compress.c
 
  static const char *gzip_args[] = {
  	"gzip", gzip_flags, NULL
+@@ -178,7 +178,7 @@
+ #define ERRDATA	2
+ 
+ private ssize_t swrite(int, const void *, size_t);
+-#if HAVE_FORK
++#ifdef HAVE_FORK
+ private size_t ncompr = __arraycount(compr);
+ private int uncompressbuf(int, size_t, size_t, const unsigned char *,
+     unsigned char **, size_t *);
 @@ -193,8 +193,7 @@
      size_t *, int);
  #endif
@@ -1636,7 +1645,7 @@ diff -u libmagic.orig/encoding.c libmagic/encoding.c
  }
 diff -u libmagic.orig/file.h libmagic/file.h
 --- libmagic.orig/file.h	2019-05-07 04:27:11.000000000 +0200
-+++ libmagic/file.h	2020-04-22 20:15:46.790840100 +0200
++++ libmagic/file.h	2020-05-20 16:42:45.933197800 +0200
 @@ -33,18 +33,9 @@
  #ifndef __file_h__
  #define __file_h__
@@ -1703,6 +1712,15 @@ diff -u libmagic.orig/file.h libmagic/file.h
  #define PATHSEP	';'
  #else
  #define PATHSEP	':'
+@@ -90,7 +90,7 @@
+ 
+ #define private static
+ 
+-#if HAVE_VISIBILITY && !defined(WIN32)
++#if defined(HAVE_VISIBILITY) && !defined(WIN32)
+ #define public  __attribute__ ((__visibility__("default")))
+ #ifndef protected
+ #define protected __attribute__ ((__visibility__("hidden")))
 @@ -116,12 +116,6 @@
  #endif
  #endif
@@ -2212,7 +2230,7 @@ diff -u libmagic.orig/fsmagic.c libmagic/fsmagic.c
  	case S_IFSOCK:
 diff -u libmagic.orig/funcs.c libmagic/funcs.c
 --- libmagic.orig/funcs.c	2019-05-07 04:27:11.000000000 +0200
-+++ libmagic/funcs.c	2020-04-14 17:15:50.737587100 +0200
++++ libmagic/funcs.c	2020-05-20 16:42:45.937726200 +0200
 @@ -31,87 +31,80 @@
  #endif	/* lint */
 
@@ -2385,7 +2403,7 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c
 -#if HAVE_FORK
 -	/* try compression stuff */
 +
-+#if PHP_FILEINFO_UNCOMPRESS
++#ifdef PHP_FILEINFO_UNCOMPRESS
  	if ((ms->flags & MAGIC_NO_CHECK_COMPRESS) == 0) {
  		m = file_zmagic(ms, &b, inname);
  		if ((ms->flags & MAGIC_DEBUG) != 0)
@@ -2394,7 +2412,7 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c
  			rv = -1;
  	}
 -#if HAVE_FORK
-+#if PHP_FILEINFO_UNCOMPRESS
++#ifdef PHP_FILEINFO_UNCOMPRESS
   done_encoding:
  #endif
 -	free(rbuf);
@@ -2435,7 +2453,7 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c
  	ms->o.pbuf = pbuf;
 
 -#if defined(HAVE_WCHAR_H) && defined(HAVE_MBRTOWC) && defined(HAVE_WCWIDTH)
-+#if defined(HAVE_WCWIDTH)
++#ifdef HAVE_WCWIDTH
  	{
  		mbstate_t state;
  		wchar_t nextchar;
@@ -3048,7 +3066,7 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
  public const char *
  magic_error(struct magic_set *ms)
 diff -u libmagic.orig/magic.h libmagic/magic.h
---- libmagic.orig/magic.h	2020-04-22 20:17:15.432186600 +0200
+--- libmagic.orig/magic.h	2020-05-20 18:02:37.550664700 +0200
 +++ libmagic/magic.h	2020-04-07 22:25:10.548560600 +0200
 @@ -124,6 +124,7 @@
 
@@ -3253,7 +3271,7 @@ diff -u libmagic.orig/readcdf.c libmagic/readcdf.c
  	if (i != -1)
 diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
 --- libmagic.orig/softmagic.c	2019-05-17 04:24:59.000000000 +0200
-+++ libmagic/softmagic.c	2020-04-07 22:25:10.548560600 +0200
++++ libmagic/softmagic.c	2020-04-26 00:43:35.734037100 +0200
 @@ -43,6 +43,10 @@
  #include <time.h>
  #include "der.h"

ext/fileinfo/libmagic/compress.c

@@ -178,7 +178,7 @@ private const struct {
 #define ERRDATA	2
 
 private ssize_t swrite(int, const void *, size_t);
-#if HAVE_FORK
+#ifdef HAVE_FORK
 private size_t ncompr = __arraycount(compr);
 private int uncompressbuf(int, size_t, size_t, const unsigned char *,
     unsigned char **, size_t *);

ext/fileinfo/libmagic/file.h

@@ -90,7 +90,7 @@
 
 #define private static
 
-#if HAVE_VISIBILITY && !defined(WIN32)
+#if defined(HAVE_VISIBILITY) && !defined(WIN32)
 #define public  __attribute__ ((__visibility__("default")))
 #ifndef protected
 #define protected __attribute__ ((__visibility__("hidden")))

ext/fileinfo/libmagic/funcs.c

@@ -255,7 +255,7 @@ file_buffer(struct magic_set *ms, php_stream *stream, zend_stat_t *st,
 	}
 #endif
 
-#if PHP_FILEINFO_UNCOMPRESS
+#ifdef PHP_FILEINFO_UNCOMPRESS
 	if ((ms->flags & MAGIC_NO_CHECK_COMPRESS) == 0) {
 		m = file_zmagic(ms, &b, inname);
 		if ((ms->flags & MAGIC_DEBUG) != 0)
@@ -367,7 +367,7 @@ file_buffer(struct magic_set *ms, php_stream *stream, zend_stat_t *st,
 		if (file_printf(ms, "%s", code_mime) == -1)
 			rv = -1;
 	}
-#if PHP_FILEINFO_UNCOMPRESS
+#ifdef PHP_FILEINFO_UNCOMPRESS
  done_encoding:
 #endif
 	efree(rbuf);
@@ -434,7 +434,7 @@ file_getbuffer(struct magic_set *ms)
 	}
 	ms->o.pbuf = pbuf;
 
-#if defined(HAVE_WCWIDTH)
+#ifdef HAVE_WCWIDTH
 	{
 		mbstate_t state;
 		wchar_t nextchar;