On 4 December 2015 at 19:09, Long, Qin <qin.l...@intel.com> wrote: > Sorry, I missed this patch. Yes, this looks good. > > Reviewed-by: Qin Long <qin.l...@intel.com> >
Thanks Qin, Committed as SVN r19135 >> -----Original Message----- >> From: Ard Biesheuvel [mailto:ard.biesheu...@linaro.org] >> Sent: Saturday, December 5, 2015 12:45 AM >> To: edk2-devel@lists.01.org; Long, Qin >> Cc: Ard Biesheuvel >> Subject: Re: [PATCH] CryptoPkg: remove global variable 'timeval' from >> OpenSslSupport.h >> >> On 3 December 2015 at 10:32, Ard Biesheuvel <ard.biesheu...@linaro.org> >> wrote: >> > The header file OpenSslSupport.h not only defines a type 'struct timeval' >> > but also defines a global variable 'timeval' of that type. The RVCT >> > compiler does not merge this definition into a common symbol, resulting >> > in duplicate definition errors in the final link. So remove the >> > variable definition. >> > >> > Contributed-under: TianoCore Contribution Agreement 1.0 >> > Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org> >> >> Qin, >> >> This is another patch that fixes the build for RVCT. Note that this is >> also related to the -fno-common discussion, but in this particular >> case, I don't think the 'timeval' variable is actually ever used. >> >> Thanks, >> Ard. >> >> >> >> > --- >> > CryptoPkg/Include/OpenSslSupport.h | 2 +- >> > 1 file changed, 1 insertion(+), 1 deletion(-) >> > >> > diff --git a/CryptoPkg/Include/OpenSslSupport.h >> > b/CryptoPkg/Include/OpenSslSupport.h >> > index 64bef42d0595..239ae8bd6f41 100644 >> > --- a/CryptoPkg/Include/OpenSslSupport.h >> > +++ b/CryptoPkg/Include/OpenSslSupport.h >> > @@ -139,7 +139,7 @@ struct tm { >> > struct timeval { >> > long tv_sec; /* time value, in seconds */ >> > long tv_usec; /* time value, in microseconds */ >> > -} timeval; >> > +}; >> > >> > struct dirent { >> > UINT32 d_fileno; /* file number of entry */ >> > -- >> > 1.9.1 >> > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
