CryptoPkg: Fix handling of &strcmp function pointers

[mirror_edk2.git] / CryptoPkg / Include / OpenSslSupport.h

diff --git a/CryptoPkg/Include/OpenSslSupport.h b/CryptoPkg/Include/OpenSslSupport.h
index 600578e780fd272b03ff2d767db6098e3f7f08e1..e6858a94a484f49c6ede8943c7185ee918d8de84 100644 (file)
--- a/CryptoPkg/Include/OpenSslSupport.h
+++ b/CryptoPkg/Include/OpenSslSupport.h
@@ -1,7 +1,7 @@
 /** @file\r
   Root include file to support building OpenSSL Crypto Library.\r
 \r
-Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -21,6 +21,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/DebugLib.h>\r
 \r
+#define OPENSSLDIR ""\r
+#define ENGINESDIR ""\r
+\r
 #define MAX_STRING_SIZE  0x1000\r
 \r
 //\r
@@ -90,6 +93,7 @@ typedef VOID  *FILE;
 #define LOG_DEBUG    7                /* debug-level messages */\r
 #define LOG_PID      0x01             /* log the pid with each message */\r
 #define LOG_CONS     0x02             /* log on the console if errors in sending */\r
+#define CHAR_BIT     8                /* Number of bits in a char */\r
 \r
 //\r
 // Macros from EFI Application Toolkit required to build Open SSL\r
@@ -216,6 +220,9 @@ int            strncmp     (const char *, const char *, size_t);
 char           *strrchr    (const char *, int);\r
 unsigned long  strtoul     (const char *, char **, int);\r
 long           strtol      (const char *, char **, int);\r
+char           *strerror   (int);\r
+size_t         strspn      (const char *, const char *);\r
+size_t         strcspn     (const char *, const char *);\r
 int            printf      (const char *, ...);\r
 int            sscanf      (const char *, const char *, ...);\r
 int            open        (const char *, int, ...);\r
@@ -269,7 +276,6 @@ extern FILE  *stdout;
 #define memchr(buf,ch,count)              ScanMem8(buf,(UINTN)(count),(UINT8)ch)\r
 #define memcmp(buf1,buf2,count)           (int)(CompareMem(buf1,buf2,(UINTN)(count)))\r
 #define memmove(dest,source,count)        CopyMem(dest,source,(UINTN)(count))\r
-#define strcmp                            AsciiStrCmp\r
 #define strncmp(string1,string2,count)    (int)(AsciiStrnCmp(string1,string2,(UINTN)(count)))\r
 #define strcpy(strDest,strSource)         AsciiStrCpyS(strDest,MAX_STRING_SIZE,strSource)\r
 #define strncpy(strDest,strSource,count)  AsciiStrnCpyS(strDest,MAX_STRING_SIZE,strSource,(UINTN)count)\r