Copy head(r18255) from main trunk excluding UNI files.svn/branches/UDK2010.SR1UDK2010.SR1

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
Signed-off-by: Hao Wu <hao.a.wu@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2010.SR1@18304 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 8 insertions, 2 deletions

diff --git a/CryptoPkg/Include/OpenSslSupport.h b/CryptoPkg/Include/OpenSslSupport.h
index 33eda7d..b5a8b58 100644
--- a/CryptoPkg/Include/OpenSslSupport.h
+++ b/CryptoPkg/Include/OpenSslSupport.h
@@ -1,7 +1,7 @@
 /** @file

   Root include file to support building OpenSSL Crypto Library.

 

-Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -72,7 +72,7 @@ typedef VOID  *FILE;
    portably, hence it is provided by a Standard C header file.

    For pre-Standard C compilers, here is a version that usually works

    (but watch out!): */

-#define offsetof(type, member) ( (int) & ((type*)0) -> member )

+#define offsetof(type, member) OFFSET_OF (type, member)

 

 //

 // Basic types from EFI Application Toolkit required to buiild Open SSL

@@ -109,6 +109,11 @@ struct tm {
   char  *tm_zone;   /* timezone abbreviation */

 };

 

+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 */

   UINT16  d_reclen;         /* length of this record */

@@ -240,5 +245,6 @@ extern FILE  *stdout;
 #define assert(expression)

 #define localtime(timer)                  NULL

 #define gmtime_r(timer,result)            (result = NULL)

+#define atoi(nptr)                        AsciiStrDecimalToUintn(nptr)

 

 #endif