update master-with-bazel from master branch

src/pki/fillins/ip_address.h

@@ -22,25 +22,25 @@ class OPENSSL_EXPORT IPAddress {
  public:
   enum : size_t { kIPv4AddressSize = 4, kIPv6AddressSize = 16 };
 
-  OPENSSL_EXPORT IPAddress();
-  OPENSSL_EXPORT IPAddress(const uint8_t *address, size_t address_len);
-  OPENSSL_EXPORT IPAddress(uint8_t b0, uint8_t b1, uint8_t b2, uint8_t b3);
-  OPENSSL_EXPORT IPAddress(uint8_t b0, uint8_t b1, uint8_t b2, uint8_t b3,
-                           uint8_t b4, uint8_t b5, uint8_t b6, uint8_t b7,
-                           uint8_t b8, uint8_t b9, uint8_t b10, uint8_t b11,
-                           uint8_t b12, uint8_t b13, uint8_t b14, uint8_t b15);
+  IPAddress();
+  IPAddress(const uint8_t *address, size_t address_len);
+  IPAddress(uint8_t b0, uint8_t b1, uint8_t b2, uint8_t b3);
+  IPAddress(uint8_t b0, uint8_t b1, uint8_t b2, uint8_t b3,
+            uint8_t b4, uint8_t b5, uint8_t b6, uint8_t b7,
+            uint8_t b8, uint8_t b9, uint8_t b10, uint8_t b11,
+            uint8_t b12, uint8_t b13, uint8_t b14, uint8_t b15);
 
   static IPAddress IPv4AllZeros();
 
-  OPENSSL_EXPORT bool IsIPv4() const;
-  OPENSSL_EXPORT bool IsIPv6() const;
-  OPENSSL_EXPORT bool IsValid() const;
+  bool IsIPv4() const;
+  bool IsIPv6() const;
+  bool IsValid() const;
 
-  OPENSSL_EXPORT const uint8_t *data() const;
-  OPENSSL_EXPORT size_t size() const;
-  OPENSSL_EXPORT const IPAddressBytes &bytes() const;
+  const uint8_t *data() const;
+  size_t size() const;
+  const IPAddressBytes &bytes() const;
 
-  OPENSSL_EXPORT bool operator==(const IPAddress &other) const {
+  bool operator==(const IPAddress &other) const {
     return addr_ == other.addr_;
   }
 

src/pki/fillins/openssl_util.h

@@ -17,8 +17,8 @@ namespace fillins {
 // the OpenSSL error stack on function exit.
 class OPENSSL_EXPORT OpenSSLErrStackTracer {
  public:
-  OPENSSL_EXPORT OpenSSLErrStackTracer();
-  OPENSSL_EXPORT ~OpenSSLErrStackTracer();
+  OpenSSLErrStackTracer();
+  ~OpenSSLErrStackTracer();
 };
 
 }  // namespace fillins

src/pki/fillins/path_service.h

@@ -15,13 +15,12 @@ namespace fillins {
 
 class OPENSSL_EXPORT FilePath {
  public:
-  OPENSSL_EXPORT FilePath();
-  OPENSSL_EXPORT FilePath(const std::string &path);
+  FilePath();
+  FilePath(const std::string &path);
 
-  OPENSSL_EXPORT const std::string &value() const;
+  const std::string &value() const;
 
-  OPENSSL_EXPORT FilePath
-  AppendASCII(const std::string &ascii_path_element) const;
+  FilePath AppendASCII(const std::string &ascii_path_element) const;
 
  private:
   std::string path_;