diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2015-12-07 06:33:27 +0000 |
|---|---|---|
| committer | abiesheuvel <abiesheuvel@Edk2> | 2015-12-07 06:33:27 +0000 |
| commit | 84c7452165816ed26cd5bdeb5666d4dc0026f116 (patch) | |
| tree | fe053500aa3434200befa2af05cf37bbe30118d5 /CryptoPkg/Include | |
| parent | 96832eefea1025c130979dec9b7da069f77bcd96 (diff) | |
| download | edk2-84c7452165816ed26cd5bdeb5666d4dc0026f116.tar.gz edk2-84c7452165816ed26cd5bdeb5666d4dc0026f116.tar.bz2 edk2-84c7452165816ed26cd5bdeb5666d4dc0026f116.zip | |
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.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Qin Long <qin.long@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19135 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'CryptoPkg/Include')
| -rw-r--r-- | CryptoPkg/Include/OpenSslSupport.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CryptoPkg/Include/OpenSslSupport.h b/CryptoPkg/Include/OpenSslSupport.h index 64bef42d05..239ae8bd6f 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 */
|