Merge remote-tracking branch 'upstream/master'

This commit is contained in:
danghvu 2013-11-28 10:17:22 -06:00
commit 4891dba953
3 changed files with 3 additions and 3 deletions

View File

@ -85,7 +85,7 @@ clean:
#cd bindings/ruby; $(MAKE) clean; rm -rf Makefile
$(MAKE) -C bindings/python clean
$(MAKE) -C bindings/csharp clean
$(MAKE) -C bindings/java clean
#$(MAKE) -C bindings/java clean
$(MAKE) -C bindings/ocaml clean
$(MAKE) -C tests clean

View File

@ -41,7 +41,7 @@ static bool compare_lower_str(char *s1, char *s2)
{
char *lower = strdup(s2), *c;
for (c = lower; *c; c++)
*c = tolower(*c);
*c = tolower((int) *c);
bool res = (strcmp(s1, lower) == 0);
free(lower);

View File

@ -26,7 +26,7 @@ static enum {
X86_REG_BP_DI = 503,
X86_REG_sib = 504,
X86_REG_sib64 = 505
} _dummy;
} __attribute__((unused)) _dummy;
static x86_reg sib_index_map[] = {
X86_REG_INVALID,