Fixed bug #60094 (C++ comment fails in c89)

diff --git a/NEWS b/NEWS
index 9c8c2f5e712dc16db7c03cb2de0a6af5967b0191..c3e2340ea940612676990e95aa81e6b51fe5ea5a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,6 @@ PHP                                                                        NEWS
   . Improve the warning message of incompatible arguments. (Laruence) 
   . Improve ternary operator performance when returning arrays. (Arnaud, Dmitry)
   
-
 - Core:
   . Fixed bug #55749 (TOCTOU issue in getenv() on Windows builds). (Pierre)
   . Fixed bug #55707 (undefined reference to `__sync_fetch_and_add_4' on Linux
@@ -19,8 +18,8 @@ PHP                                                                        NEWS
   . Fixed bug #60038 (SIGALRM cause segfault in php_error_cb). (Laruence)
 
 - Openssl
-- Revert r313616 (When we have a blocking SSL socket, respect the timeout
-  option, scottmac), breaks ssl support as described in bugs #55283 and #55848
+  . Revert r313616 (When we have a blocking SSL socket, respect the timeout
+    option, scottmac), breaks ssl support as described in bugs #55283 and #55848
   
 - PDO DBlib driver:
   . Fixed bug #60033 (Incorrectly merged PDO dblib patches break
@@ -49,6 +48,9 @@ PHP                                                                        NEWS
 - Litespeed SAPI:
   . Fixed bug #55769 (Make Fails with "Missing Separator" error). (Adam)
 
+- Fileinfo:
+  . Fixed bug #60094 (C++ comment fails in c89). (Laruence)
+
 15 Sep 2011, PHP 5.4.0 Beta
 - General improvements:
   . Added callable typehint. (Hannes)

diff --git a/ext/fileinfo/libmagic.patch b/ext/fileinfo/libmagic.patch
index 2e791f37a304f3014f50cb3d7e352609c4dd90a0..3b99ce5dcfb3f1fe0d87707480a58b374310bf8d 100644 (file)
--- a/ext/fileinfo/libmagic.patch
+++ b/ext/fileinfo/libmagic.patch
@@ -853,7 +853,7 @@ diff -u libmagic.orig/cdf.h libmagic/cdf.h
  void cdf_unpack_header(cdf_header_t *, char *);
 diff -u libmagic.orig/cdf_time.c libmagic/cdf_time.c
 --- libmagic.orig/cdf_time.c   2011-09-15 23:28:13.000000000 +0800
-+++ libmagic/cdf_time.c        2011-09-15 23:28:26.000000000 +0800
++++ libmagic/cdf_time.c        2011-10-19 22:51:40.000000000 +0800
 @@ -96,7 +96,7 @@
  }
  
@@ -874,6 +874,15 @@ diff -u libmagic.orig/cdf_time.c libmagic/cdf_time.c
  
        t /= CDF_TIME_PREC;
        tm.tm_sec = t % 60;
+@@ -117,7 +117,7 @@
+       tm.tm_hour = t % 24;
+       t /= 24;
+ 
+-      // XXX: Approx
++      /* XXX: Approx */
+       tm.tm_year = CDF_BASE_YEAR + (t / 365);
+ 
+       rdays = cdf_getdays(tm.tm_year);
 @@ -143,7 +143,7 @@
  }
  

diff --git a/ext/fileinfo/libmagic/cdf_time.c b/ext/fileinfo/libmagic/cdf_time.c
index 36372966a78b5d69744c2b59611ad26f6ef88f01..750c5986a0b54580104a379d896a123794354088 100644 (file)
--- a/ext/fileinfo/libmagic/cdf_time.c
+++ b/ext/fileinfo/libmagic/cdf_time.c
@@ -117,7 +117,7 @@ cdf_timestamp_to_timespec(struct timeval *ts, cdf_timestamp_t t)
        tm.tm_hour = t % 24;
        t /= 24;
 
-       // XXX: Approx
+       /* XXX: Approx */
        tm.tm_year = CDF_BASE_YEAR + (t / 365);
 
        rdays = cdf_getdays(tm.tm_year);