From: Derick Rethans <derick@php.net>
Date: Fri, 25 Jul 2008 08:18:34 +0000 (+0000)
Subject: - No C++ comments.
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~1061
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0192c570c8c789f832f9ae3272732e80985d684c;p=php

- No C++ comments.
---

diff --git a/ext/fileinfo/libmagic.patch b/ext/fileinfo/libmagic.patch
index 8342b2a1d8..1427d87d61 100644
--- 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 1d525f37c8..211758fc68 100644
--- 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)