From 5afd392bb6ddde79f0518ffd913bd8c365bf39e6 Mon Sep 17 00:00:00 2001
From: Alex Merry <alex.merry@cs.ox.ac.uk>
Date: Tue, 29 Jan 2013 13:54:59 +0000
Subject: Fix variable declarations

yy* vars are owned by the lexer file (and should be externed from
elsewhere).
---
 tikzit/src/common/TikzGraphAssembler.m | 6 +++---
 tikzit/src/common/tikzlexer.lm         | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/tikzit/src/common/TikzGraphAssembler.m b/tikzit/src/common/TikzGraphAssembler.m
index 050b5fe..b07ee58 100644
--- a/tikzit/src/common/TikzGraphAssembler.m
+++ b/tikzit/src/common/TikzGraphAssembler.m
@@ -34,11 +34,11 @@ extern int yylex_destroy(void);
 static NSLock *parseLock = nil;
 static id currentAssembler = nil;
 
-int yylineno;
-int yyleng;
+extern int yylineno;
+extern int yyleng;
 int lineno;
 int tokenpos;
-char *yystr;
+extern char *yystr;
 char linebuff[500];
 
 
diff --git a/tikzit/src/common/tikzlexer.lm b/tikzit/src/common/tikzlexer.lm
index 8f34ace..816d91c 100644
--- a/tikzit/src/common/tikzlexer.lm
+++ b/tikzit/src/common/tikzlexer.lm
@@ -34,7 +34,6 @@
 
 extern char linebuff[500];
 extern int lineno;
-extern yy_size_t yyleng;
 extern int tokenpos;
 
 %}
-- 
cgit v1.2.3