kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Place comment(lib, *) pragmas under OPENSSL_MSVC_PRAGMA.

Browse Source 
This clears the last of Android's build warnings from BoringSSL. These
pragmas aren't actually no-ops, but it just means that MinGW consumers
(i.e. just Android) need to explicitly list the dependency (which they
do).

There may be something to be said for removing those and having everyone
list dependencies, but I don't really want to chase down every
consumer's build files. Probably not worth the trouble.

Change-Id: I8fcff954a6d5de9471f456db15c54a1b17cb937a
Reviewed-on: https://boringssl-review.googlesource.com/11573
Commit-Queue: David Benjamin <davidben@google.com>
Commit-Queue: Adam Langley <agl@google.com>
Reviewed-by: Adam Langley <agl@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
This commit is contained in:
David Benjamin 2016-10-10 14:56:47 -04:00 committed by CQ bot account: commit-bot@chromium.org
parent 8404bdb9a6
commit 4fec04b484
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/bio/socket.c
View File

@ -67,7 +67,7 @@ OPENSSL_MSVC_PRAGMA(warning(push, 3))
#include <winsock2.h> #include <winsock2.h>
OPENSSL_MSVC_PRAGMA(warning(pop)) OPENSSL_MSVC_PRAGMA(warning(pop))
#pragma comment(lib, "Ws2_32.lib") OPENSSL_MSVC_PRAGMA(comment(lib, "Ws2_32.lib"))
#endif #endif
#include "internal.h" #include "internal.h"

2
ssl/test/bssl_shim.cc
View File

@ -33,7 +33,7 @@ OPENSSL_MSVC_PRAGMA(warning(push, 3))
#include <ws2tcpip.h> #include <ws2tcpip.h>
OPENSSL_MSVC_PRAGMA(warning(pop)) OPENSSL_MSVC_PRAGMA(warning(pop))
#pragma comment(lib, "Ws2_32.lib") OPENSSL_MSVC_PRAGMA(comment(lib, "Ws2_32.lib"))
#endif #endif
#include <assert.h> #include <assert.h>

2
tool/transport_common.cc
View File

@ -40,7 +40,7 @@ OPENSSL_MSVC_PRAGMA(warning(push, 3))
OPENSSL_MSVC_PRAGMA(warning(pop)) OPENSSL_MSVC_PRAGMA(warning(pop))
typedef int ssize_t; typedef int ssize_t;
#pragma comment(lib, "Ws2_32.lib") OPENSSL_MSVC_PRAGMA(comment(lib, "Ws2_32.lib"))
#endif #endif
#include <openssl/err.h> #include <openssl/err.h>