From 5e6d79abdb449e69f02de8edabd78fd5df4bafef Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 18 Dec 2015 14:35:58 +0000 Subject: CryptoPkg: remove global variable 'timeval' from OpenSslSupport .h 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. (Sync patch r19135 from main trunk.) Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel Reviewed-by: Qin Long git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2015@19422 6f19259b-4bc3-4df7-8a09-765794883524 --- CryptoPkg/Include/OpenSslSupport.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CryptoPkg/Include') diff --git a/CryptoPkg/Include/OpenSslSupport.h b/CryptoPkg/Include/OpenSslSupport.h index 2c6e23cee3..dc89097041 100644 --- a/CryptoPkg/Include/OpenSslSupport.h +++ b/CryptoPkg/Include/OpenSslSupport.h @@ -114,7 +114,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 */ -- cgit v1.2.3