diff options
| author | pvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-29 03:36:45 +0000 |
|---|---|---|
| committer | pvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-29 03:36:45 +0000 |
| commit | 1a1573001d8e6ed63e7ee5755be26c7c1405619b (patch) | |
| tree | 822acc1afdd0d1619c8961e1938cc6fb87faafe2 /net/socket | |
| parent | 21a74c315ec4c5f1978740ac6d3d8d1b969a293c (diff) | |
| download | chromium_src-1a1573001d8e6ed63e7ee5755be26c7c1405619b.zip chromium_src-1a1573001d8e6ed63e7ee5755be26c7c1405619b.tar.gz chromium_src-1a1573001d8e6ed63e7ee5755be26c7c1405619b.tar.bz2 | |
BSD port: USE_NSS and other macros instead of OS_LINUX where applicable
Review URL: http://codereview.chromium.org/556068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37492 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/client_socket.h | 3 | ||||
| -rw-r--r-- | net/socket/client_socket_factory.cc | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/net/socket/client_socket.h b/net/socket/client_socket.h index e959d84..28c7b4d 100644 --- a/net/socket/client_socket.h +++ b/net/socket/client_socket.h @@ -8,7 +8,8 @@ #include "build/build_config.h" // For struct sockaddr and socklen_t. -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_POSIX) +#include <sys/types.h> #include <sys/socket.h> #elif defined(OS_WIN) #include <ws2tcpip.h> diff --git a/net/socket/client_socket_factory.cc b/net/socket/client_socket_factory.cc index fe2ce10..9458381 100644 --- a/net/socket/client_socket_factory.cc +++ b/net/socket/client_socket_factory.cc @@ -8,7 +8,7 @@ #include "build/build_config.h" #if defined(OS_WIN) #include "net/socket/ssl_client_socket_win.h" -#elif defined(OS_LINUX) +#elif defined(USE_NSS) #include "net/socket/ssl_client_socket_nss.h" #elif defined(OS_MACOSX) #include "net/socket/ssl_client_socket_mac.h" @@ -30,7 +30,7 @@ class DefaultClientSocketFactory : public ClientSocketFactory { const SSLConfig& ssl_config) { #if defined(OS_WIN) return new SSLClientSocketWin(transport_socket, hostname, ssl_config); -#elif defined(OS_LINUX) +#elif defined(USE_NSS) return new SSLClientSocketNSS(transport_socket, hostname, ssl_config); #elif defined(OS_MACOSX) return new SSLClientSocketMac(transport_socket, hostname, ssl_config); |