Merge branch 'cooking' of github.com:graphitemaster/gmqcc into cooking

This commit is contained in:
Dale Weiler 2013-09-24 07:32:23 -04:00
commit fac4e411bf
3 changed files with 2 additions and 3 deletions

View file

@ -7,7 +7,7 @@ script: make && make check
notifications:
irc:
channels:
- "irc.freenode.org#kf-engine"
- "irc.freenode.org#gmqcc"
template:
- "[%{commit} : %{author}] %{message}"
- "%{build_url}"

View file

@ -326,7 +326,6 @@ int con_out(const char *fmt, ...) {
return ln;
}
#ifndef QCVM_EXECUTOR
/*
* Utility console message writes for lexer contexts. These will allow
* for reporting of file:line based on lexer context, These are used
@ -379,6 +378,7 @@ void con_cprintmsg(lex_ctx_t ctx, int lvl, const char *msgtype, const char *msg,
va_end (va);
}
#ifndef QCVM_EXECUTOR
/* General error interface */
size_t compile_errors = 0;
size_t compile_warnings = 0;

1
exec.c
View file

@ -30,7 +30,6 @@
#include "gmqcc.h"
opts_cmd_t opts; /* command line options */
static void loaderror(const char *fmt, ...)
{
int err = errno;