ObjFW  Diff

Differences From Artifact [e4ca2499ce]:

• File src/socket.h — part of check-in [3924c79b73] at 2018-03-10 19:43:01 on branch trunk — socket.h: Provide sockaddr_storage on AmigaOS 4 (user: js, size: 2362) [annotate] [blame] [check-ins using]

To Artifact [31842887c2]:

• File src/socket.h — part of check-in [fe2cbe0021] at 2018-04-22 16:13:04 on branch trunk — runtime: Define BOOL to be the same as bool

  As we define the ABI, we can just replace BOOL with bool everywhere,
  including in ObjFW itself. For the Apple platforms where BOOL and bool
  are different, this is not a problem as BOOL and bool are passed and
  returned the same way in the ABI.

  This still defines BOOL to bool for compatibility, except on AmigaOS and
  Wii, which both have its own BOOL type. (user: js, size: 2233) [annotate] [blame] [check-ins using]

22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42

#endif

#include <stdbool.h>

#import "platform.h"

#ifdef OF_HAVE_SYS_SOCKET_H
# ifdef OF_MORPHOS
#  define BOOL EXEC_BOOL
# endif
# include <sys/socket.h>
# ifdef OF_MORPHOS
#  undef BOOL
# endif
#endif
#ifdef OF_HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
#ifdef OF_HAVE_NETINET_TCP_H
# include <netinet/tcp.h>
#endif

<
<
<

<
<
<

22
23
24
25
26
27
28



29



30
31
32
33
34
35
36

#endif

#include <stdbool.h>

#import "platform.h"

#ifdef OF_HAVE_SYS_SOCKET_H



# include <sys/socket.h>



#endif
#ifdef OF_HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
#ifdef OF_HAVE_NETINET_TCP_H
# include <netinet/tcp.h>
#endif

73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89

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

#ifdef OF_WII
# define BOOL OGC_BOOL
# include <network.h>
# undef BOOL

struct sockaddr_storage {
	u8 ss_len;
	u8 ss_family;
	u8 ss_data[14];
};
#endif

<

<

67
68
69
70
71
72
73

74

75
76
77
78
79
80
81

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

#ifdef OF_WII

# include <network.h>


struct sockaddr_storage {
	u8 ss_len;
	u8 ss_family;
	u8 ss_data[14];
};
#endif