Permalink
Browse files

Merge pull request #5 from RoboTux/amd64_ftbfs.

Fix errors and warnings from last build on amd64.
  • Loading branch information...
2 parents 8f60448 + a6d01c1 commit 36370420ac99336b1ef03517d7c12347b54347d6 @hugosantos committed May 2, 2011
Showing with 3 additions and 3 deletions.
  1. +1 −0 include/mrd/support/ptree.h
  2. +1 −2 src/parser.cpp
  3. +1 −1 src/timers.cpp
@@ -35,6 +35,7 @@
#ifndef _Ptree_h_
#define _Ptree_h_
+#include <cstddef>
#include <stdint.h>
#include <algorithm>
#include <mrd/log.h>
View
@@ -171,7 +171,7 @@ int parser_context::eat(int count, ...) {
int parser_context::read_token(bool strict, int *sym, const char **symstart,
bool eat) {
int res, readnum;
- int pointer = 0, prevpointer = 0;
+ int pointer = 0;
int linenumber = m_current_line;
int state = 0;
const char *currline = m_input_line_start;
@@ -236,7 +236,6 @@ int parser_context::read_token(bool strict, int *sym, const char **symstart,
break;
}
- prevpointer = pointer;
pointer += readnum;
}
View
@@ -403,7 +403,7 @@ bool timermgr::output_info(base_stream &ctx, bool extended) const {
namelen = 50;
char fmt[64];
- snprintf(fmt, sizeof(fmt), "| %%%is | %%12s | %%10s | %%8s |", (int)namelen);
+ snprintf(fmt, sizeof(fmt), "| %%%zs | %%12s | %%10s | %%8s |", namelen);
_draw_sep(ctx, namelen);
ctx.printf(fmt, "timer name", "time left", "interval", "repeat").newl();

0 comments on commit 3637042

Please sign in to comment.