Rename user struct to fix ubuntu arm build failure

This commit is contained in:
Erik Ekman 2012-02-05 00:49:30 +01:00
parent 423cbec41d
commit 24f1959bab
2 changed files with 4 additions and 4 deletions

View File

@ -33,7 +33,7 @@
#include "encoding.h"
#include "user.h"
struct user *users;
struct tun_user *users;
unsigned usercount;
int
@ -59,7 +59,7 @@ init_users(in_addr_t my_ip, int netbits)
maxusers = (1 << (32-netbits)) - 3; /* 3: Net addr, broadcast addr, iodined addr */
usercount = MIN(maxusers, USERS);
users = calloc(usercount, sizeof(struct user));
users = calloc(usercount, sizeof(struct tun_user));
for (i = 0; i < usercount; i++) {
in_addr_t ip;
users[i].id = i;

View File

@ -33,7 +33,7 @@
#define QMEMDATA_LEN 15
/* Max advisable: 36/2 = 18. Total mem usage: QMEMDATA_LEN * USERS * 6 bytes */
struct user {
struct tun_user {
char id;
int active;
int disabled;
@ -73,7 +73,7 @@ struct user {
#endif
};
extern struct user *users;
extern struct tun_user *users;
int init_users(in_addr_t, int);
const char* users_get_first_ip();