diff options
| author | Simon Levermann <simon@levermaenner.de> | 2013-08-08 18:06:10 +0200 |
|---|---|---|
| committer | Simon Levermann <simon@levermaenner.de> | 2013-08-08 18:06:10 +0200 |
| commit | 320c5a6708fba36c48c62ec0dca8ad2d5b865b5d (patch) | |
| tree | bb4d459ba2531f960f6f955a9facff500f8ffb4a /core/network.h | |
| parent | b5f5b1a111d9e08b2b001b5d4d76629019462f39 (diff) | |
| parent | caedd4489ef34e4afffbde9c4917439f3187f6ab (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'core/network.h')
| -rw-r--r-- | core/network.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/network.h b/core/network.h index d246a9d1..d3c39333 100644 --- a/core/network.h +++ b/core/network.h | |||
| @@ -66,6 +66,11 @@ extern "C" { | |||
| 66 | 66 | ||
| 67 | #define MAX_UDP_PACKET_SIZE 65507 | 67 | #define MAX_UDP_PACKET_SIZE 65507 |
| 68 | 68 | ||
| 69 | |||
| 70 | /* Current time, unix format */ | ||
| 71 | #define unix_time() ((uint64_t)time(NULL)) | ||
| 72 | |||
| 73 | |||
| 69 | typedef union { | 74 | typedef union { |
| 70 | uint8_t c[4]; | 75 | uint8_t c[4]; |
| 71 | uint16_t s[2]; | 76 | uint16_t s[2]; |