From 78db44847136cd196a74f80ed3ad1d76b3d4f06d Mon Sep 17 00:00:00 2001
From: spx <spx268@gmail.com>
Date: Fri, 28 Jan 2011 13:13:12 +0000
Subject: [PATCH] - Removed problematic setting from Lua headers. - Removed
 unused locale strings from mparser.c. (They caused a problem on
 editing/compiling in some environments.)

---
 Library/Library.vcproj        | 96 -----------------------------------
 Library/ccalc-0.5.1/mparser.c | 22 --------
 2 files changed, 118 deletions(-)

diff --git a/Library/Library.vcproj b/Library/Library.vcproj
index 9e198c45..20b69dd1 100644
--- a/Library/Library.vcproj
+++ b/Library/Library.vcproj
@@ -2592,22 +2592,6 @@
 				<File
 					RelativePath=".\lua\glue\lua_group.h"
 					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalOptions="/wd4800"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalOptions="/wd4800"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath=".\lua\glue\lua_measure.cpp"
@@ -2634,22 +2618,6 @@
 				<File
 					RelativePath=".\lua\glue\lua_measure.h"
 					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalOptions="/wd4800"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalOptions="/wd4800"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath=".\lua\glue\lua_meter.cpp"
@@ -2676,22 +2644,6 @@
 				<File
 					RelativePath=".\lua\glue\lua_meter.h"
 					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalOptions="/wd4800"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalOptions="/wd4800"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath=".\lua\glue\lua_meterstring.cpp"
@@ -2718,22 +2670,6 @@
 				<File
 					RelativePath=".\lua\glue\lua_meterstring.h"
 					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalOptions="/wd4800"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalOptions="/wd4800"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath=".\lua\glue\lua_meterwindow.cpp"
@@ -2760,22 +2696,6 @@
 				<File
 					RelativePath=".\lua\glue\lua_meterwindow.h"
 					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalOptions="/wd4800"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalOptions="/wd4800"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath=".\lua\glue\lua_rainmeter.cpp"
@@ -2802,22 +2722,6 @@
 				<File
 					RelativePath=".\lua\glue\lua_rainmeter.h"
 					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalOptions="/wd4800"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalOptions="/wd4800"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath=".\lua\glue\lua_rainmeter_ext.cpp"
diff --git a/Library/ccalc-0.5.1/mparser.c b/Library/ccalc-0.5.1/mparser.c
index 4c5de6a4..e75dcbed 100644
--- a/Library/ccalc-0.5.1/mparser.c
+++ b/Library/ccalc-0.5.1/mparser.c
@@ -17,26 +17,6 @@
 const double DblErR = -1.68736462823243E308;
 const double DblNiN = -1.68376462823243E308;
 
-#if (defined(__WIN32) || defined(__WIN32__)) && defined(RUSSIAN)
-
-char eBrackets [] = "#Ошибка со скобками!";
-char eSyntax   [] = "#Синтиксическая ошибка!";
-char eInternal [] = "#Внутренняя ошибка!";
-char eExtraOp  [] = "#Лишняя операция!";
-char eInfinity [] = "#Где-то бесконечность!";
-char eInvArg   [] = "#Неверный аргумент!";
-char eUnknFunc [] = "# %s - Неизвестная функция/перменная!";
-char eExtrnFunc[] = "#Ошибка внешней функции!";
-char eLogicErr [] = "#Ошибка в логическом выражении!";
-char eCalcErr  [] = "#Ошибка при вычислениях!";
-char eUnexpEnd [] = "#Неожиданный конец скрипта!";
-char eExpVarRet[] = "#Ожидается переменная или return!";
-char eExpAssign[] = "#Ожидается присваивание!";
-char eValSizErr[] = "#Значение слишком большое для операции!";
-char eInvPrmCnt[] = "#Неверное количество параметров при вызове функции!"
-
-#else 
-
 char eBrackets [] = "#Brackets not match!";
 char eSyntax   [] = "#Syntax error!";
 char eInternal [] = "#Internal error!";
@@ -53,8 +33,6 @@ char eExpAssign[] = "#Assignment expected!";
 char eValSizErr[] = "#Value too big for operation!";
 char eInvPrmCnt[] = "#Invalid parameters count for function call!";
 
-#endif /* __WIN32__ */
-
 static double _neg_(double);
 static double _frac_(double);
 static double _trunc_(double);