Skip to content

Fix collision of exp declared by mathcalls.h is avoided. #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmuhamedagic merged 1 commit into from
May 2, 2014
Merged

Fix collision of exp declared by mathcalls.h is avoided. #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ int client_add(int fd, const struct booth_transport *tpt,
void process_connection(int ci)
{
struct boothc_ticket_msg msg;
int rv, len, exp, fd;
int rv, len, expr, fd;
void (*deadfn) (int ci);


Expand All @@ -242,11 +242,11 @@ void process_connection(int ci)
log_error("got wrong length %u", len);
return;
}
exp = len - sizeof(msg.header);
rv = do_read(clients[ci].fd, msg.header.data, exp);
expr = len - sizeof(msg.header);
rv = do_read(clients[ci].fd, msg.header.data, expr);
if (rv < 0) {
log_error("connection %d read data error %d, wanted %d",
ci, rv, exp);
ci, rv, expr);
goto kill;
}
}
Expand Down