[haiku-commits] haiku: hrev45100 - headers/posix/sys src/bin/network/ftp
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 28 Dec 2012 22:33:28 +0100 (CET)
hrev45100 adds 1 changeset to branch 'master'
old head: 9d2f78ca74da4b47ec612a611feaf44755f13ee4
new head: ef769e5e87d9b16125b0fb1e51fc8b90a91a3cb0
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=ef769e5+%5E9d2f78c
----------------------------------------------------------------------------
ef769e5: add declaration of sa_family_t in sys/socket.h
* added missing declaration of sa_family_t in sys/socket.h, this fixes #8731
thanks to Anarchos for the patch.
* fixed the build of the command ftp
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev45100
Commit: ef769e5e87d9b16125b0fb1e51fc8b90a91a3cb0
URL: http://cgit.haiku-os.org/haiku/commit/?id=ef769e5
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Fri Dec 28 21:28:13 2012 UTC
Ticket: https://dev.haiku-os.org/ticket/8731
----------------------------------------------------------------------------
2 files changed, 5 insertions(+), 2 deletions(-)
headers/posix/sys/socket.h | 5 +++--
src/bin/network/ftp/extern.h | 2 ++
----------------------------------------------------------------------------
diff --git a/headers/posix/sys/socket.h b/headers/posix/sys/socket.h
index 0514d91..16547a8 100644
--- a/headers/posix/sys/socket.h
+++ b/headers/posix/sys/socket.h
@@ -13,6 +13,7 @@
typedef uint32_t socklen_t;
+typedef uint8_t sa_family_t;
/* Address families */
#define AF_UNSPEC 0
@@ -86,13 +87,13 @@ struct linger {
struct sockaddr {
uint8_t sa_len;
- uint8_t sa_family;
+ sa_family_t sa_family;
uint8_t sa_data[30];
};
struct sockaddr_storage {
uint8_t ss_len; /* total length */
- uint8_t ss_family; /* address family */
+ sa_family_t ss_family; /* address family */
uint8_t __ss_pad1[6]; /* align to quad */
uint64_t __ss_pad2; /* force alignment to 64 bit */
uint8_t __ss_pad3[112]; /* pad to a total of 128 bytes */
diff --git a/src/bin/network/ftp/extern.h b/src/bin/network/ftp/extern.h
index 3070e95..9be2b20 100644
--- a/src/bin/network/ftp/extern.h
+++ b/src/bin/network/ftp/extern.h
@@ -100,7 +100,9 @@ struct sockaddr;
struct tm;
struct addrinfo;
+#ifndef __HAIKU__
typedef int sa_family_t;
+#endif
void abort_remote(FILE *);
void abort_squared(int);
Other related posts:
