ObjFW  Diff

Differences From Artifact [d3d411a803]:

• File src/socket.h — part of check-in [e1559236a9] at 2017-05-16 22:35:54 on branch trunk — Add struct sockaddr_storage for MorphOS (user: js, size: 2092) [annotate] [blame] [check-ins using]

To Artifact [40a01b9a4a]:

• File src/socket.h — part of check-in [d302df8b46] at 2017-05-17 22:14:55 on branch trunk — typedef socklen_t to int on MorphOS

  The previous approach of including <pthread.h> - which has the typedef -
  turned out to be wrong, as that header is only a stub and including it
  breaks things.

  Since all the functions taking a socklen_t on other platforms take an
  int on MorphOS, creating a typedef to int is the proper way. (user: js, size: 2037) [annotate] [blame] [check-ins using]

42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57

#  endif
# endif
# include <windows.h>
# include <ws2tcpip.h>
#endif

#ifdef OF_MORPHOS
/* Strangely, MorphOS defines socklen_t in pthread.h */
# include <pthread.h>

struct sockaddr_storage {
	uint8_t ss_len;
	uint8_t ss_family;
	char ss_data[2 + sizeof(struct in_addr) + 8];
};
#endif

|
<

42
43
44
45
46
47
48
49

50
51
52
53
54
55
56

#  endif
# endif
# include <windows.h>
# include <ws2tcpip.h>
#endif

#ifdef OF_MORPHOS
typedef int socklen_t;


struct sockaddr_storage {
	uint8_t ss_len;
	uint8_t ss_family;
	char ss_data[2 + sizeof(struct in_addr) + 8];
};
#endif