Revision: 19422
http://sourceforge.net/p/edk2/code/19422
Author: vanjeff
Date: 2015-12-18 14:35:58 +0000 (Fri, 18 Dec 2015)
Log Message:
-----------
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 <[email protected]>
Reviewed-by: Qin Long <[email protected]>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/19135
Modified Paths:
--------------
branches/UDK2015/CryptoPkg/Include/OpenSslSupport.h
Modified: branches/UDK2015/CryptoPkg/Include/OpenSslSupport.h
===================================================================
--- branches/UDK2015/CryptoPkg/Include/OpenSslSupport.h 2015-12-18 11:35:44 UTC
(rev 19421)
+++ branches/UDK2015/CryptoPkg/Include/OpenSslSupport.h 2015-12-18 14:35:58 UTC
(rev 19422)
@@ -114,7 +114,7 @@
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 */
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
