diff options
| author | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-05-04 00:56:11 +0000 |
|---|---|---|
| committer | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-05-04 00:56:11 +0000 |
| commit | c61fb9c8a40f5999f89512bf33df57a2098928c1 (patch) | |
| tree | d03cabf094f6aad802b190b56f0e5a5898b50606 | |
| parent | b58675785e4891585b0d2683ae42671368bb9f95 (diff) | |
| download | edk2-platforms-c61fb9c8a40f5999f89512bf33df57a2098928c1.tar.xz | |
CryptoPkg OpenSslSupport.h: Do not instantiate data in an include file
Include files should never instantiate data. Data should only
be referenced as an 'extern' within include files.
The previous code would generate a GCC warning, since the static
data items were not always referenced.
Signed-off-by: jljusten
Reviewed-by: qlong
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11608 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | CryptoPkg/Include/OpenSslSupport.h | 8 | ||||
| -rw-r--r-- | CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/CryptoPkg/Include/OpenSslSupport.h b/CryptoPkg/Include/OpenSslSupport.h index 258854b101..dc25fd7b72 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, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2011, 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
@@ -219,9 +219,9 @@ __sighandler_t *signal (int, __sighandler_t *); //
// Global variables from EFI Application Toolkit required to buiild Open SSL
//
-static FILE *stderr;
-static FILE *stdin;
-static FILE *stdout;
+extern FILE *stderr;
+extern FILE *stdin;
+extern FILE *stdout;
//
// Macros that directly map functions to BaseLib, BaseMemoryLib, and DebugLib functions
diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c index 46574dc8f5..79957cc89f 100644 --- a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c +++ b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c @@ -2,7 +2,7 @@ C Run-Time Libraries (CRT) Wrapper Implementation for OpenSSL-based
Cryptographic Library.
-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2011, 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
@@ -17,6 +17,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. int errno = 0;
+FILE *stderr = NULL;
+FILE *stdin = NULL;
+FILE *stdout = NULL;
+
typedef
INTN
(*SORT_COMPARE)(
|