diff options
| author | David Wragg <david@rabbitmq.com> | 2010-07-26 02:41:55 +0100 |
|---|---|---|
| committer | David Wragg <david@rabbitmq.com> | 2010-07-26 02:41:55 +0100 |
| commit | e16672cf9ded0b329090b8612a2b1d3f9831288c (patch) | |
| tree | cc36834d4058565ce5f0744ab3b6039367a3334e | |
| parent | 61e18281077967ce3684f9182e8d7337da37c0b2 (diff) | |
| download | rabbitmq-c-github-ask-e16672cf9ded0b329090b8612a2b1d3f9831288c.tar.gz | |
Eliminate the socket_ prefix on connect
To be consistent with the reduced consistency.
| -rw-r--r-- | librabbitmq/amqp_socket.c | 2 | ||||
| -rw-r--r-- | librabbitmq/unix/socket.h | 1 | ||||
| -rw-r--r-- | librabbitmq/windows/socket.h | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/librabbitmq/amqp_socket.c b/librabbitmq/amqp_socket.c index 3f88120..fc823be 100644 --- a/librabbitmq/amqp_socket.c +++ b/librabbitmq/amqp_socket.c @@ -87,7 +87,7 @@ int amqp_open_socket(char const *hostname, return -encoded_socket_errno(); if (socket_setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, &one, sizeof(one)) < 0 - || socket_connect(sockfd, (struct sockaddr *) &addr, sizeof(addr)) < 0) + || connect(sockfd, (struct sockaddr *) &addr, sizeof(addr)) < 0) { res = -encoded_socket_errno(); socket_close(sockfd); diff --git a/librabbitmq/unix/socket.h b/librabbitmq/unix/socket.h index e54c4cb..185e651 100644 --- a/librabbitmq/unix/socket.h +++ b/librabbitmq/unix/socket.h @@ -67,7 +67,6 @@ static inline int socket_init(void) extern int socket_socket(int domain, int type, int proto); -#define socket_connect connect #define socket_setsockopt setsockopt #define socket_close close #define socket_writev writev diff --git a/librabbitmq/windows/socket.h b/librabbitmq/windows/socket.h index a5b091d..6a2da25 100644 --- a/librabbitmq/windows/socket.h +++ b/librabbitmq/windows/socket.h @@ -56,7 +56,6 @@ extern int socket_init(void); #define socket_socket socket -#define socket_connect connect #define socket_close closesocket static inline int socket_setsockopt(int sock, int level, int optname, |