- No C++ comments.

diff --git a/ext/fileinfo/libmagic.patch b/ext/fileinfo/libmagic.patch
index 8342b2a1d80a1dc1ff1d00f5697f001c23edea05..1427d87d6105b3888267b510b651abb767d037f2 100644 (file)
--- a/ext/fileinfo/libmagic.patch
+++ b/ext/fileinfo/libmagic.patch
@@ -2,10 +2,9 @@ Index: libmagic/apprentice.c
 ===================================================================
 RCS file: /repository/pecl/fileinfo/libmagic/apprentice.c,v
 retrieving revision 1.1
-retrieving revision 1.6
-diff -u -r1.1 -r1.6
+diff -u -r1.1 apprentice.c
 --- libmagic/apprentice.c      11 Jul 2008 14:13:50 -0000      1.1
-+++ libmagic/apprentice.c      25 Jul 2008 08:16:03 -0000      1.6
++++ libmagic/apprentice.c      25 Jul 2008 08:18:07 -0000
 @@ -157,6 +157,10 @@
  }
  #endif /* COMPILE_ONLY */
@@ -99,7 +98,7 @@ diff -u -r1.1 -r1.6
 +#ifdef PHP_BUNDLE
 +      if (fn == NULL)
 +              *nmagicp = (sizeof(php_magic_database) / sizeof(struct magic));
-+      else // the statement after the #endif is used
++      else /* the statement after the #endif is used */
 +#endif
        *nmagicp = (uint32_t)(st.st_size / sizeof(struct magic));
        if (*nmagicp > 0)

diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c
index 1d525f37c8767e635f9716eb0f865a1a27fcb262..211758fc684c64a48b367b99a7fd0ca6c5533682 100644 (file)
--- a/ext/fileinfo/libmagic/apprentice.c
+++ b/ext/fileinfo/libmagic/apprentice.c
@@ -1978,7 +1978,7 @@ internal_loaded:
 #ifdef PHP_BUNDLE
        if (fn == NULL)
                *nmagicp = (sizeof(php_magic_database) / sizeof(struct magic));
-       else // the statement after the #endif is used
+       else /* the statement after the #endif is used */
 #endif
        *nmagicp = (uint32_t)(st.st_size / sizeof(struct magic));
        if (*nmagicp > 0)