ObjFW  Check-in [9af6b18d87]

Overview
Comment:Work around s_net already being defined on Solaris
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 9af6b18d87fd1fe33490598e3b42a7a0427ecd02a6b4ff829da449045b419000
User & Date: js on 2023-04-16 21:44:33
Other Links: manifest | tags
Context
2023-04-16
22:44
GitHub Actions: Fix wrong pkg for clang on DFBSD check-in: 076889bd2e user: js tags: trunk
21:44
Work around s_net already being defined on Solaris check-in: 9af6b18d87 user: js tags: trunk
19:59
Add DragonFly BSD to GitHub Actions check-in: 5545b47d08 user: js tags: trunk
Changes

Modified src/OFSocket.h from [755345bacd] to [3c58ebd4cf].

154
155
156
157
158
159
160
161
162
163


164
165
166
167
168
169
170
171







172
173
174
175
176
177
178
154
155
156
157
158
159
160



161
162

163






164
165
166
167
168
169
170
171
172
173
174
175
176
177







-
-
-
+
+
-

-
-
-
-
-
-
+
+
+
+
+
+
+







# define sipx_port sa_socket
#endif

#ifndef OF_HAVE_APPLETALK
struct sockaddr_at {
	sa_family_t sat_family;
	uint8_t sat_port;
	struct at_addr {
		uint16_t s_net;
		uint8_t s_node;
	uint16_t sat_net;
	uint8_t sat_node;
	} sat_addr;
};
#endif
#ifdef OF_WINDOWS
# define sat_port sat_socket
#else
# define sat_net sat_addr.s_net
# define sat_node sat_addr.s_node
#else
# ifdef OF_WINDOWS
#  define sat_port sat_socket
# else
#  define sat_net sat_addr.s_net
#  define sat_node sat_addr.s_node
# endif
#endif

/**
 * @struct OFSocketAddress OFSocket.h ObjFW/OFSocket.h
 *
 * @brief A struct which represents a host / port pair for a socket.
 */