ObjFW: Diff

Differences From Artifact [a30a66785b]:

File src/socket.h — part of check-in [3cba61d694] at 2017-06-03 16:58:46 on branch trunk — Make sockets work on MorphOS + libnix (user: js, size: 2267) [annotate] [blame] [check-ins using]

File src/socket.h — part of check-in [c9621825fc] at 2017-06-04 18:48:03 on branch trunk — Treat MorphOS + ixemul as a separate platform
This reduces the ifdef hell and makes much more sense, as with ixemul,
no native calls are allowed. (user: js, size: 2323) [annotate] [blame] [check-ins using]

︙
21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39	21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39	- + - +	#endif #include <stdbool.h> #import "platform.h" #ifdef OF_HAVE_SYS_SOCKET_H ~~# if ~~defined(~~OF_MORPHOS~~) && !defined(OF_IXEMUL)~~~~ # ifdef OF_MORPHOS # define BOOL EXEC_BOOL # endif # include <sys/socket.h> ~~# if ~~defined(~~OF_MORPHOS~~) && !defined(OF_IXEMUL)~~~~ # ifdef OF_MORPHOS # undef BOOL # endif #endif #ifdef OF_HAVE_NETINET_IN_H # include <netinet/in.h> #endif #ifdef OF_HAVE_NETINET_TCP_H
︙
50 51 52 53 54 55 56 57 58 ~~59 60~~ 61 62 63 64 65 66 67 68	50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74	- - - + + + + + + + + +	# endif # endif # include <windows.h> # include <ws2tcpip.h> #endif #ifdef OF_MORPHOS ~~# ifndef OF_IXEMUL~~ typedef long socklen_t; ~~# else~~ ~~typedef in~~t sockle~~n_t;~~ struct sockaddr_storage { uint8_t ss_len; uint8_t ss_family; char ss_data[2 + sizeof(struct in_addr) + 8]; }; #endif #ifdef OF_MORPHOS_IXEMUL 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
︙