Moved a define and fixed another.

This commit is contained in:
irungentoo 2013-08-08 10:59:22 -04:00
parent e8ee3c0cd3
commit a3a0fb57cb
3 changed files with 9 additions and 3 deletions

View File

@ -30,8 +30,6 @@
extern "C" { extern "C" {
#endif #endif
/* Current time, unix format */
#define unix_time() ((uint64_t)time(NULL))
/* size of the client_id in bytes */ /* size of the client_id in bytes */
#define CLIENT_ID_SIZE crypto_box_PUBLICKEYBYTES #define CLIENT_ID_SIZE crypto_box_PUBLICKEYBYTES

View File

@ -66,6 +66,11 @@ extern "C" {
#define MAX_UDP_PACKET_SIZE 65507 #define MAX_UDP_PACKET_SIZE 65507
/* Current time, unix format */
#define unix_time() ((uint64_t)time(NULL))
typedef union { typedef union {
uint8_t c[4]; uint8_t c[4];
uint16_t s[2]; uint16_t s[2];

View File

@ -22,7 +22,10 @@ extern int add_req(uint8_t *public_key); // XXX
/* Holds status of chat windows */ /* Holds status of chat windows */
char WINDOW_STATUS[MAX_WINDOW_SLOTS]; char WINDOW_STATUS[MAX_WINDOW_SLOTS];
//#define TOXICVER "0.1.0" //Will be moved to a -D flag later
#ifndef TOXICVER
#define TOXICVER "NOVER" //Use the -D flag to set this
#endif
static ToxWindow windows[MAX_WINDOW_SLOTS]; static ToxWindow windows[MAX_WINDOW_SLOTS];
static ToxWindow* prompt; static ToxWindow* prompt;