From b873f0ebf023e6918d17217bb69e56f5195526ed Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Wed, 19 Oct 2011 15:08:50 +0000 Subject: [PATCH] Fixed bug #60094 (C++ comment fails in c89) --- ext/fileinfo/libmagic.patch | 11 ++++++++++- ext/fileinfo/libmagic/cdf_time.c | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ext/fileinfo/libmagic.patch b/ext/fileinfo/libmagic.patch index 2e791f37a3..3b99ce5dcf 100644 --- 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 36372966a7..750c5986a0 100644 --- 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); -- 2.40.0