i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add declaration of sa_family_t in sys/socket.h

Browse Source 
* 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
This commit is contained in:
Jérôme Duval
2012-12-28 22:28:13 +01:00
parent 9d2f78ca74
commit ef769e5e87
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/posix/sys/socket.h
+3 -2
View File
@@ -13,6 +13,7 @@
typedef uint32_t socklen_t; typedef uint32_t socklen_t;
typedef uint8_t sa_family_t;
/* Address families */ /* Address families */
#define AF_UNSPEC 0 #define AF_UNSPEC 0
@@ -86,13 +87,13 @@ struct linger {
struct sockaddr { struct sockaddr {
uint8_t sa_len; uint8_t sa_len;
uint8_t sa_family; sa_family_t sa_family;
uint8_t sa_data[30]; uint8_t sa_data[30];
}; };
struct sockaddr_storage { struct sockaddr_storage {
uint8_t ss_len; /* total length */ 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 */ uint8_t __ss_pad1[6]; /* align to quad */
uint64_t __ss_pad2; /* force alignment to 64 bit */ uint64_t __ss_pad2; /* force alignment to 64 bit */
uint8_t __ss_pad3[112]; /* pad to a total of 128 bytes */ uint8_t __ss_pad3[112]; /* pad to a total of 128 bytes */
src/bin/network/ftp/extern.h
+2
View File
@@ -100,7 +100,9 @@ struct sockaddr;
struct tm; struct tm;
struct addrinfo; struct addrinfo;
#ifndef __HAIKU__
typedef int sa_family_t; typedef int sa_family_t;
#endif
void abort_remote(FILE *); void abort_remote(FILE *);
void abort_squared(int); void abort_squared(int);