1
0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 05:53:02 +01:00

Merge pull request #90 from Jman012/master

Fixed another clang issue with bools that broek file sending.
This commit is contained in:
Sean 2014-03-11 13:22:07 -07:00
commit 7c63bd80d6
2 changed files with 4 additions and 4 deletions

View File

@ -156,8 +156,8 @@ char *wc_to_char(wchar_t ch)
return ret; return ret;
} }
/* Returns true if connection has timed out, false otherwise */ /* Returns 1 if connection has timed out, 0 otherwise */
bool timed_out(uint64_t timestamp, uint64_t curtime, uint64_t timeout) int timed_out(uint64_t timestamp, uint64_t curtime, uint64_t timeout)
{ {
return timestamp + timeout <= curtime; return timestamp + timeout <= curtime;
} }

View File

@ -48,8 +48,8 @@ uint8_t *wcs_to_mbs(wchar_t *string);
/* convert a wide char to multibyte char */ /* convert a wide char to multibyte char */
char *wc_to_char(wchar_t ch); char *wc_to_char(wchar_t ch);
/* Returns true if connection has timed out, false otherwise */ /* Returns 1 if connection has timed out, 0 otherwise */
bool timed_out(uint64_t timestamp, uint64_t timeout, uint64_t curtime); int timed_out(uint64_t timestamp, uint64_t timeout, uint64_t curtime);
/* Colours the window tab according to type. Beeps if is_beep is true */ /* Colours the window tab according to type. Beeps if is_beep is true */
void alert_window(ToxWindow *self, int type, bool is_beep); void alert_window(ToxWindow *self, int type, bool is_beep);