From 8d2a6ca419299e180d14a5de21ab1099242207c2 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <wry.git@bumiller.com>
Date: Thu, 19 Sep 2013 20:55:32 +0200
Subject: [PATCH 1/3] moving the QCVM_EXECUTOR ifdef in conout.c - these are
 used in the executor

---
 conout.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conout.c b/conout.c
index aedff4d..63391d6 100644
--- a/conout.c
+++ b/conout.c
@@ -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;

From 99422d0cf462d6bc42b339f8fb934ee772e620aa Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <wry.git@bumiller.com>
Date: Thu, 19 Sep 2013 20:55:41 +0200
Subject: [PATCH 2/3] this is still there twice...

---
 exec.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/exec.c b/exec.c
index 4fcb683..c4de8ad 100644
--- a/exec.c
+++ b/exec.c
@@ -30,7 +30,6 @@
 
 #include "gmqcc.h"
 
-opts_cmd_t   opts; /* command line options */
 static void loaderror(const char *fmt, ...)
 {
     int     err = errno;

From 37a4265e0664203490f932ea955d79e45de92848 Mon Sep 17 00:00:00 2001
From: Dale Weiler <cube2killfield@gmail.com>
Date: Sun, 22 Sep 2013 08:43:47 -0400
Subject: [PATCH 3/3] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index fdadff8..4b6f959 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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}"