diff options
| author | Coren[m] <Break@Ocean> | 2013-09-12 19:34:28 +0200 |
|---|---|---|
| committer | Coren[m] <Break@Ocean> | 2013-09-12 19:34:28 +0200 |
| commit | c35e0bd6e39b066a53f2797fc84fe3b620eeb6eb (patch) | |
| tree | 58a2c679a51b1c46b362b3db0f14bcac2f334873 /toxcore/network.h | |
| parent | 20f865521a6c3dafae85533a490c483621440e73 (diff) | |
| parent | b37b521cd5fa9454d34cb5d5ebdc2d378529cac2 (diff) | |
Merge remote-tracking branch 'upstream/master' into nTox
Diffstat (limited to 'toxcore/network.h')
| -rw-r--r-- | toxcore/network.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toxcore/network.h b/toxcore/network.h index 2d08e88d..98307e5b 100644 --- a/toxcore/network.h +++ b/toxcore/network.h | |||
| @@ -72,7 +72,7 @@ | |||
| 72 | #define NET_PACKET_DATA 18 /* Data packet ID. */ | 72 | #define NET_PACKET_DATA 18 /* Data packet ID. */ |
| 73 | #define NET_PACKET_CRYPTO 32 /* Encrypted data packet ID. */ | 73 | #define NET_PACKET_CRYPTO 32 /* Encrypted data packet ID. */ |
| 74 | #define NET_PACKET_LAN_DISCOVERY 33 /* LAN discovery packet ID. */ | 74 | #define NET_PACKET_LAN_DISCOVERY 33 /* LAN discovery packet ID. */ |
| 75 | 75 | #define NET_PACKET_GROUP_CHATS 48 /* Group chats packet ID. */ | |
| 76 | 76 | ||
| 77 | /* Current time, unix format */ | 77 | /* Current time, unix format */ |
| 78 | #define unix_time() ((uint64_t)time(NULL)) | 78 | #define unix_time() ((uint64_t)time(NULL)) |