gcc compilation fix

git-svn-id: http://svn.miranda-ng.org/main/trunk@9310 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

6 files changed, 25 insertions, 9 deletions

diff --git a/plugins/TrafficCounter/.cproject b/plugins/TrafficCounter/.cproject
index 1d60bff501..d1ce15cca3 100644
--- a/plugins/TrafficCounter/.cproject
+++ b/plugins/TrafficCounter/.cproject
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">

+<?fileVersion 4.0.0?>

+

+<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">

 	<storageModule moduleId="org.eclipse.cdt.core.settings">

 		<cconfiguration id="org.eclipse.cdt.msvc.dll.debug.887237590">

 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="org.eclipse.cdt.msvc.dll.debug.887237590" moduleId="org.eclipse.cdt.core.settings" name="Debug">

@@ -7,7 +9,7 @@
 					<externalSetting>

 						<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/TrafficCounter"/>

 						<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/TrafficCounter/Debug"/>

-						<entry flags="RESOLVED" kind="libraryFile" name="TrafficCounter"/>

+						<entry flags="RESOLVED" kind="libraryFile" name="TrafficCounter" srcPrefixMapping="" srcRootPath=""/>

 					</externalSetting>

 				</externalSettings>

 				<extensions>

@@ -32,6 +34,7 @@
 								<option id="org.eclipse.cdt.msvc.cl.option.includes.441685381" name="Include Path (/I)" superClass="org.eclipse.cdt.msvc.cl.option.includes" valueType="includePath">

 									<listOptionValue builtIn="false" value="&quot;..\..\..\Include&quot;"/>

 									<listOptionValue builtIn="false" value="&quot;..\..\ExternalAPI&quot;"/>

+									<listOptionValue builtIn="false" value="C:\Program Files\Microsoft SDKs\Windows\v7.0A\Include"/>

 								</option>

 								<option id="org.eclipse.cdt.msvc.cl.option.macros.1240665997" name="Defines (/D)" superClass="org.eclipse.cdt.msvc.cl.option.macros" valueType="definedSymbols">

 									<listOptionValue builtIn="false" value="DEBUG"/>

@@ -41,6 +44,9 @@
 								<inputType id="org.eclipse.cdt.msvc.cl.inputType.1397372383" superClass="org.eclipse.cdt.msvc.cl.inputType"/>

 							</tool>

 							<tool id="org.eclipse.cdt.msvc.rc.dll.debug.471866324" name="Resource Compiler (rc)" superClass="org.eclipse.cdt.msvc.rc.dll.debug">

+								<option id="org.eclipse.cdt.msvc.rc.option.includes.392868353" name="Include Path (/I)" superClass="org.eclipse.cdt.msvc.rc.option.includes" valueType="includePath">

+									<listOptionValue builtIn="false" value="&quot;..\..\..\Include&quot;"/>

+								</option>

 								<inputType id="org.eclipse.cdt.msvc.rc.inputType.1657877978" superClass="org.eclipse.cdt.msvc.rc.inputType"/>

 							</tool>

 							<tool id="org.eclipse.cdt.msvc.link.dll.debug.533490912" name="Linker (link)" superClass="org.eclipse.cdt.msvc.link.dll.debug">

@@ -76,7 +82,7 @@
 					<externalSetting>

 						<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/TrafficCounter"/>

 						<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/TrafficCounter/Release"/>

-						<entry flags="RESOLVED" kind="libraryFile" name="TrafficCounter"/>

+						<entry flags="RESOLVED" kind="libraryFile" name="TrafficCounter" srcPrefixMapping="" srcRootPath=""/>

 					</externalSetting>

 				</externalSettings>

 				<extensions>

@@ -101,6 +107,7 @@
 								<option id="org.eclipse.cdt.msvc.cl.option.includes.2040009850" name="Include Path (/I)" superClass="org.eclipse.cdt.msvc.cl.option.includes" valueType="includePath">

 									<listOptionValue builtIn="false" value="&quot;..\..\..\Include&quot;"/>

 									<listOptionValue builtIn="false" value="&quot;..\..\ExternalAPI&quot;"/>

+									<listOptionValue builtIn="false" value="C:\Program Files\Microsoft SDKs\Windows\v7.0A\Include"/>

 								</option>

 								<option id="org.eclipse.cdt.msvc.cl.option.macros.865983604" name="Defines (/D)" superClass="org.eclipse.cdt.msvc.cl.option.macros" valueType="definedSymbols">

 									<listOptionValue builtIn="false" value="NDEBUG"/>

@@ -110,6 +117,9 @@
 								<inputType id="org.eclipse.cdt.msvc.cl.inputType.1870081348" superClass="org.eclipse.cdt.msvc.cl.inputType"/>

 							</tool>

 							<tool id="org.eclipse.cdt.msvc.rc.dll.release.426267774" name="Resource Compiler (rc)" superClass="org.eclipse.cdt.msvc.rc.dll.release">

+								<option id="org.eclipse.cdt.msvc.rc.option.includes.686044655" name="Include Path (/I)" superClass="org.eclipse.cdt.msvc.rc.option.includes" valueType="includePath">

+									<listOptionValue builtIn="false" value="&quot;..\..\..\Include&quot;"/>

+								</option>

 								<inputType id="org.eclipse.cdt.msvc.rc.inputType.210914062" superClass="org.eclipse.cdt.msvc.rc.inputType"/>

 							</tool>

 							<tool id="org.eclipse.cdt.msvc.link.dll.release.1456328195" name="Linker (link)" superClass="org.eclipse.cdt.msvc.link.dll.release">

@@ -153,4 +163,5 @@
 	</storageModule>

 	<storageModule moduleId="refreshScope"/>

 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>

+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

 </cproject>

diff --git a/plugins/TrafficCounter/src/TrafficCounter.h b/plugins/TrafficCounter/src/TrafficCounter.h
index 825344d5ed..a033d67289 100644
--- a/plugins/TrafficCounter/src/TrafficCounter.h
+++ b/plugins/TrafficCounter/src/TrafficCounter.h
@@ -84,4 +84,4 @@ int PaintTrafficCounterWindow(HWND, HDC);
 INT_PTR MenuCommand_TrafficShowHide(WPARAM, LPARAM);

 void Traffic_AddMainMenuItem(void);

 

-#endif;

+#endif

diff --git a/plugins/TrafficCounter/src/commonheaders.h b/plugins/TrafficCounter/src/commonheaders.h
index dfc2e4d9ca..55d5af287b 100644
--- a/plugins/TrafficCounter/src/commonheaders.h
+++ b/plugins/TrafficCounter/src/commonheaders.h
@@ -22,11 +22,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #define _CRT_SECURE_NO_WARNINGS

 

+#ifndef _WIN32_IE

+#define _WIN32_IE 0x0500

+#endif

+

 #include <windows.h>

 #include <windowsx.h>

 #include <commctrl.h>

 

 #include <win2k.h>

+#include <m_system.h>

+

 #include <newpluginapi.h>

 #include <m_netlib.h>

 #include <m_langpack.h>

diff --git a/plugins/TrafficCounter/src/misc.cpp b/plugins/TrafficCounter/src/misc.cpp
index 6320117246..cf1215ec8a 100644
--- a/plugins/TrafficCounter/src/misc.cpp
+++ b/plugins/TrafficCounter/src/misc.cpp
@@ -189,7 +189,8 @@ WORD GetDurationFormatM(DWORD Duration, TCHAR *Format, TCHAR *Buffer, WORD Size)
 		*Res; // Промежуточный результат.

 

 	Res = (TCHAR*)malloc(sizeof(TCHAR)); // Выделяем чуть-чуть памяти под результат, но это только начало.

-	SecureZeroMemory(Res, sizeof(TCHAR));

+	//SecureZeroMemory(Res, sizeof(TCHAR));

+	Res[0] = 0;

 

 	for (FormatIndex = 0; Format[FormatIndex];)

 	{

diff --git a/plugins/TrafficCounter/src/statistics.h b/plugins/TrafficCounter/src/statistics.h
index 17b7d5c4e3..ebe368e27d 100644
--- a/plugins/TrafficCounter/src/statistics.h
+++ b/plugins/TrafficCounter/src/statistics.h
@@ -42,4 +42,4 @@ DWORD Stat_GetItemValue(WORD SelectedAccs, BYTE Interval, DWORD ItemNum, BYTE Su
 DWORD Stat_GetRecordsNumber(BYTE AccNum, BYTE Interval);

 BYTE Stat_GetEldestAcc(WORD SelectedAccs);

 

-#endif _statistics_h
\ No newline at end of file
+#endif // _statistics_h
\ No newline at end of file
diff --git a/plugins/TrafficCounter/src/vars.h b/plugins/TrafficCounter/src/vars.h
index 0b35ec2670..36aa5135f7 100644
--- a/plugins/TrafficCounter/src/vars.h
+++ b/plugins/TrafficCounter/src/vars.h
@@ -1,9 +1,7 @@
 #ifndef _vars_h

 #define _vars_h

 

-//extern BYTE numProto;

 extern int NumberOfAccounts;

-//extern PROTOLIST *ProtoList;

 void RegisterVariablesTokens(void);

 

-#endif _vars_h
\ No newline at end of file
+#endif // _vars_h
\ No newline at end of file