diff options
| author | irungentoo <irungentoo@gmail.com> | 2014-05-08 18:26:01 -0400 |
|---|---|---|
| committer | irungentoo <irungentoo@gmail.com> | 2014-05-08 18:26:01 -0400 |
| commit | a26ced5fcb7a9a8bf6b4795c95b04277c14b84f2 (patch) | |
| tree | 8a659c2dc15414ff227cf43c793f20ee2a91cbe1 /toxcore/TCP_server.h | |
| parent | 98f20c76de801d042c695b3034056b2cfbfeaab5 (diff) | |
| parent | 89022326d3742defd9c7b1111ddcda53688d85be (diff) | |
Merge branch 'master' into TCP
Diffstat (limited to 'toxcore/TCP_server.h')
| -rw-r--r-- | toxcore/TCP_server.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toxcore/TCP_server.h b/toxcore/TCP_server.h index 26cfa493..2a6b8276 100644 --- a/toxcore/TCP_server.h +++ b/toxcore/TCP_server.h | |||
| @@ -138,7 +138,7 @@ uint16_t read_TCP_length(sock_t sock); | |||
| 138 | */ | 138 | */ |
| 139 | int read_TCP_packet(sock_t sock, uint8_t *data, uint16_t length); | 139 | int read_TCP_packet(sock_t sock, uint8_t *data, uint16_t length); |
| 140 | 140 | ||
| 141 | /* return length of recieved packet on success. | 141 | /* return length of received packet on success. |
| 142 | * return 0 if could not read any packet. | 142 | * return 0 if could not read any packet. |
| 143 | * return -1 on failure (connection must be killed). | 143 | * return -1 on failure (connection must be killed). |
| 144 | */ | 144 | */ |