From 95a7371a508d881fdfddf26db22dd9b623374385 Mon Sep 17 00:00:00 2001 From: firleju Date: Mon, 31 Oct 2016 16:03:38 +0100 Subject: [PATCH] =?UTF-8?q?Dopisanie=20extern=C3=B3w=20do=20zmiennych=20z?= =?UTF-8?q?=20warning=C3=B3w=20linkera.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- McZapkie/mctools.cpp | 5 +++++ McZapkie/mctools.h | 22 ++++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/McZapkie/mctools.cpp b/McZapkie/mctools.cpp index a8ca04a6..bb061687 100644 --- a/McZapkie/mctools.cpp +++ b/McZapkie/mctools.cpp @@ -22,6 +22,11 @@ Copyright (C) 2007-2014 Maciej Cierniak using namespace std; /*================================================*/ +int ConversionError = 0; +int LineCount = 0; +bool DebugModeFlag = false; +bool FreeFlyModeFlag = false; + //std::string Ups(std::string s) //{ // int jatka; diff --git a/McZapkie/mctools.h b/McZapkie/mctools.h index b54f0cf6..f97a441c 100644 --- a/McZapkie/mctools.h +++ b/McZapkie/mctools.h @@ -42,10 +42,10 @@ static int const CutRight = 1; static int const CutBoth = 0; /*Cut_Space*/ static double const pi = 3.141592653589793; -int ConversionError = 0; -int LineCount = 0; -bool DebugModeFlag = false; -bool FreeFlyModeFlag = false; +extern int ConversionError; +extern int LineCount; +extern bool DebugModeFlag; +extern bool FreeFlyModeFlag; typedef unsigned long/*?*//*set of: char */ TableChar; /*MCTUTIL*/ @@ -150,10 +150,16 @@ inline bool fileExists(const std::string &name) return (stat(name.c_str(), &buffer) == 0); } - double Xmin; double Ymin; double Xmax; double Ymax; - double Xaspect; double Yaspect; - double Hstep; double Vstep; - int Vsize; int Hsize; +extern double Xmin; +extern double Ymin; +extern double Xmax; +extern double Ymax; +extern double Xaspect; +extern double Yaspect; +extern double Hstep; +extern double Vstep; +extern int Vsize; +extern int Hsize; double Xhor( double h); /* Converts horizontal screen coordinate into real X-coordinate. */