Skip to content

Commit

Permalink
Place comment(lib, *) pragmas under OPENSSL_MSVC_PRAGMA.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
davidben authored and CQ bot account: commit-bot@chromium.org committed Oct 10, 2016
1 parent 8404bdb commit 4fec04b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion crypto/bio/socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ OPENSSL_MSVC_PRAGMA(warning(push, 3))
#include <winsock2.h>
OPENSSL_MSVC_PRAGMA(warning(pop))

#pragma comment(lib, "Ws2_32.lib")
OPENSSL_MSVC_PRAGMA(comment(lib, "Ws2_32.lib"))
#endif

#include "internal.h"
Expand Down
2 changes: 1 addition & 1 deletion ssl/test/bssl_shim.cc
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ OPENSSL_MSVC_PRAGMA(warning(push, 3))
#include <ws2tcpip.h>
OPENSSL_MSVC_PRAGMA(warning(pop))

#pragma comment(lib, "Ws2_32.lib")
OPENSSL_MSVC_PRAGMA(comment(lib, "Ws2_32.lib"))
#endif

#include <assert.h>
Expand Down
2 changes: 1 addition & 1 deletion tool/transport_common.cc
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ OPENSSL_MSVC_PRAGMA(warning(push, 3))
OPENSSL_MSVC_PRAGMA(warning(pop))

typedef int ssize_t;
#pragma comment(lib, "Ws2_32.lib")
OPENSSL_MSVC_PRAGMA(comment(lib, "Ws2_32.lib"))
#endif

#include <openssl/err.h>
Expand Down

0 comments on commit 4fec04b

Please sign in to comment.