summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-01-18 18:07:12 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-01-18 18:07:12 +0000
commit09122b4014e4dd260f62181c7465e03523b7e2cc (patch)
tree1e89930dbdc641529720306fd6a2753841e723b6
parentadc7023c82af508c7ae1f2a5493d02e5eec6f8b0 (diff)
compilation fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@7736 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--include/m_string.h5
-rw-r--r--src/miranda32_12.vcxproj1
-rw-r--r--src/miranda32_12.vcxproj.filters3
3 files changed, 9 insertions, 0 deletions
diff --git a/include/m_string.h b/include/m_string.h
index 20c9f8dbd0..4660d3e387 100644
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -23,6 +23,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#pragma once
+#ifndef M_STRING_H__
+
+#include <stdio.h>
#include <string.h>
#include <mbstring.h>
#include <wchar.h>
@@ -2220,3 +2223,5 @@ __forceinline int ChTraitsCRT<char>::Format(LPSTR pszBuffer, size_t nlength, LPC
{
return vsprintf_s(pszBuffer, nlength, pszFormat, args);
}
+
+#endif // M_STRING_H__
diff --git a/src/miranda32_12.vcxproj b/src/miranda32_12.vcxproj
index 6ee6727dc9..d799df4f48 100644
--- a/src/miranda32_12.vcxproj
+++ b/src/miranda32_12.vcxproj
@@ -250,6 +250,7 @@
<ClInclude Include="..\include\m_protomod.h" />
<ClInclude Include="..\include\m_protosvc.h" />
<ClInclude Include="..\include\m_skin.h" />
+ <ClInclude Include="..\include\m_string.h" />
<ClInclude Include="..\include\m_system.h" />
<ClInclude Include="..\include\m_system_cpp.h" />
<ClInclude Include="..\include\m_timezones.h" />
diff --git a/src/miranda32_12.vcxproj.filters b/src/miranda32_12.vcxproj.filters
index ae423bc26b..e061bdbf54 100644
--- a/src/miranda32_12.vcxproj.filters
+++ b/src/miranda32_12.vcxproj.filters
@@ -264,6 +264,9 @@
<ClInclude Include="modules\chat\chat.h">
<Filter>Modules\chat</Filter>
</ClInclude>
+ <ClInclude Include="..\include\m_string.h">
+ <Filter>SDK</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="core\commonheaders.cpp">