From 1e5213d43fdd170bb0c30af914a4e40610014b2b Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Sat, 21 Jun 2014 04:09:27 -0700
Subject: [PATCH] Quell MSVC C99 bugs.

---
 sourcepawn/compiler/sc1.c | 6 +++---
 sourcepawn/compiler/sc2.c | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/sourcepawn/compiler/sc1.c b/sourcepawn/compiler/sc1.c
index 1e4ebde52..abe822c2c 100644
--- a/sourcepawn/compiler/sc1.c
+++ b/sourcepawn/compiler/sc1.c
@@ -3550,6 +3550,8 @@ static void domethodmap(LayoutSpec spec)
 {
   int val;
   char *str;
+  LayoutSpec old_spec;
+  methodmap_t *parent = NULL;
   const char *spectype = layout_spec_name(spec);
 
   // methodmap ::= "methodmap" symbol ("<" symbol)? "{" methodmap-body "}"
@@ -3561,12 +3563,10 @@ static void domethodmap(LayoutSpec spec)
   if (!isupper(*mapname))
     error(109, spectype);
 
-  LayoutSpec old_spec = deduce_layout_spec_by_name(mapname);
+  old_spec = deduce_layout_spec_by_name(mapname);
   if (!can_redef_layout_spec(spec, old_spec))
     error(110, mapname, layout_spec_name(old_spec));
 
-  methodmap_t *parent = NULL;
-
   if (matchtoken('<')) {
     if (lex(&val, &str) != tSYMBOL) {
       error(93);
diff --git a/sourcepawn/compiler/sc2.c b/sourcepawn/compiler/sc2.c
index fa28e6b1f..aea32437b 100644
--- a/sourcepawn/compiler/sc2.c
+++ b/sourcepawn/compiler/sc2.c
@@ -242,8 +242,6 @@ static void check_empty(const unsigned char *lptr)
 static void doinclude(int silent)
 {
   char name[_MAX_PATH];
-  char symname[sNAMEMAX+1];
-  char *ptr;
   char c;
   int i, result;