Procházet zdrojové kódy

Place comment(lib, *) pragmas under OPENSSL_MSVC_PRAGMA.

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>
kris/onging/CECPQ3_patch15
David Benjamin před 8 roky
committed by CQ bot account: commit-bot@chromium.org
rodič
revize
4fec04b484
3 změnil soubory, kde provedl 3 přidání a 3 odebrání
  1. +1
    -1
      crypto/bio/socket.c
  2. +1
    -1
      ssl/test/bssl_shim.cc
  3. +1
    -1
      tool/transport_common.cc

+ 1
- 1
crypto/bio/socket.c Zobrazit soubor

@@ -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"


+ 1
- 1
ssl/test/bssl_shim.cc Zobrazit soubor

@@ -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>


+ 1
- 1
tool/transport_common.cc Zobrazit soubor

@@ -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>


Načítá se…
Zrušit
Uložit