$ git status
On branch updatebot-test-pull-chillerbot
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Changes to be committed:
modified: Doxyfile
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: src/base/system.h
Conflicts:
src/base/system.h
/**
* Fetches a sample from a high resolution timer and converts it in microseconds.
*
* @ingroup Time
*
* @return Current value of the timer in microseconds.
*/
int64_t time_get_microseconds();
<<<<<<< HEAD
/* Group: Network General */
typedef struct NETSOCKET_INTERNAL *NETSOCKET;
=======
/**
* @defgroup Network-General
*/
/**
* @ingroup Network-General
*/
--
*
* @return 0 on success
*/
int net_addr_from_str(NETADDR *addr, const char *string);
/**
* @defgroup Network-UDP
* @ingroup Network-General
*/
<<<<<<< HEAD
/*
Function: net_socket_type
Determine a socket's type.
Parameters:
sock - Socket whose type should be determined.
Returns:
The socket type, a bitset of `NETTYPE_IPV4`, `NETTYPE_IPV6` and
`NETTYPE_WEBSOCKET_IPV4`.
--
* @param sock Socket to use.
* @param addr Where to send the packet.
* @param data Pointer to the packet data to send.
* @param size Size of the packet.
*
* @return On success it returns the number of bytes sent. Returns -1
* on error.
*/
int net_udp_send(NETSOCKET sock, const NETADDR *addr, const void *data, int size);
<<<<<<< HEAD
/*
Function: net_udp_recv
Receives a packet over an UDP socket.
Parameters:
sock - Socket to use.
addr - Pointer to an NETADDR that will receive the address.
data - Received data. Will be invalidated when this function is
called again.
--
* @param b String to compare.
*
* @return `< 0` - String a is less than string b
* @return `0` - String a is equal to string b
* @return `> 0` - String a is greater than string b
*
* @remark The strings are treated as zero-terminated strings.
*/
int str_comp_filenames(const char *a, const char *b);
<<<<<<< HEAD
/*
Function: str_startswith_nocase
Checks case insensitive whether the string begins with a certain prefix.
Parameter:
str - String to check.
prefix - Prefix to look for.
Returns:
A pointer to the string str after the string prefix, or 0 if
Failed to merge https://github.com/ddnet/ddnet/pull/4732 into chillerbot
Conflicts: