Changeset 24f195

Timestamp:

02/05/12 00:49:30 (4 months ago)

Author:

Erik Ekman <erik@…>

Branches:

master

Children:

242416

Parents:

423cbe

git-author:

Erik Ekman <erik@…> (02/05/12 00:49:30)

git-committer:

Erik Ekman <erik@…> (02/05/12 00:49:30)

Message:

Rename user struct to fix ubuntu arm build failure

Location:

src

Files:

• user.c (modified) (2 diffs)
• user.h (modified) (2 diffs)

src/user.c

@@ -34 +34 @@
 #include "user.h"
 
-struct user *users;
+struct tun_user *users;
 unsigned usercount;
 
@@ -60 +60 @@
         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;

src/user.h

@@ -34 +34 @@
 /* Max advisable: 36/2 = 18. Total mem usage: QMEMDATA_LEN * USERS * 6 bytes */
 
-struct user {
+struct tun_user {
         char id;
         int active;
@@ -74 +74 @@
 };
 
-extern struct user *users;
+extern struct tun_user *users;
 
 int init_users(in_addr_t, int);