Differences From 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]
To Artifact [01ae00b901]:
- File src/socket.h — part of check-in [b16f2b9e25] at 2018-07-28 17:38:30 on branch trunk — Rename of_{udp_ -> }socket_address (user: js, size: 3054) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
43 44 45 46 47 48 49 50 51 52 53 54 55 56 |
# ifdef __MINGW64_VERSION_MAJOR
# include <winsock2.h>
# endif
# endif
# include <windows.h>
# include <ws2tcpip.h>
#endif
#ifdef OF_AMIGAOS
struct sockaddr_storage {
uint8_t ss_len;
uint8_t ss_family;
char ss_data[2 + sizeof(struct in_addr) + 8];
};
| > > | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 |
# ifdef __MINGW64_VERSION_MAJOR
# include <winsock2.h>
# endif
# endif
# include <windows.h>
# include <ws2tcpip.h>
#endif
/*! @file */
#ifdef OF_AMIGAOS
struct sockaddr_storage {
uint8_t ss_len;
uint8_t ss_family;
char ss_data[2 + sizeof(struct in_addr) + 8];
};
|
| ︙ | ︙ | |||
98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 |
#ifndef OF_WINDOWS
typedef int of_socket_t;
#else
typedef SOCKET of_socket_t;
#endif
#ifdef __cplusplus
extern "C" {
#endif
extern bool of_socket_init(void);
extern int of_socket_errno(void);
# ifndef OF_WII
extern int of_getsockname(of_socket_t sock, struct sockaddr *restrict addr,
socklen_t *restrict addrLen);
# endif
#ifdef __cplusplus
}
#endif
OF_ASSUME_NONNULL_END
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 |
#ifndef OF_WINDOWS
typedef int of_socket_t;
#else
typedef SOCKET of_socket_t;
#endif
/*!
* @struct of_socket_address_t socket.h ObjFW/socket.h
*
* @brief A struct which represents a host / port pair for a socket.
*/
typedef struct OF_BOXABLE {
struct sockaddr_storage address;
socklen_t length;
} of_socket_address_t;
#ifdef __cplusplus
extern "C" {
#endif
extern bool of_socket_init(void);
extern int of_socket_errno(void);
# ifndef OF_WII
extern int of_getsockname(of_socket_t sock, struct sockaddr *restrict addr,
socklen_t *restrict addrLen);
# endif
/*!
* @brief Compares two of_socket_address_t for equality.
*
* @param address1 The address to compare with the second address
* @param address2 The second address
* @return Whether the two addresses are equal
*/
extern bool of_socket_address_equal(of_socket_address_t *address1,
of_socket_address_t *address2);
/*!
* @brief Returns the hash for the specified of_socket_address_t.
*
* @param address The address to hash
* @return The hash for the specified of_socket_address_t
*/
extern uint32_t of_socket_address_hash(of_socket_address_t *address);
#ifdef __cplusplus
}
#endif
OF_ASSUME_NONNULL_END
|