summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--builds/msvc/c_local_lat/c_local_lat.vcproj4
-rw-r--r--builds/msvc/c_local_thr/c_local_thr.vcproj4
-rw-r--r--builds/msvc/c_remote_lat/c_remote_lat.vcproj4
-rw-r--r--builds/msvc/c_remote_thr/c_remote_thr.vcproj4
-rw-r--r--foreign/xmlParser/xmlParser.cpp2
-rw-r--r--perf/helpers.cpp4
6 files changed, 18 insertions, 4 deletions
diff --git a/builds/msvc/c_local_lat/c_local_lat.vcproj b/builds/msvc/c_local_lat/c_local_lat.vcproj
index a8d9a8d..5f7cdb2 100644
--- a/builds/msvc/c_local_lat/c_local_lat.vcproj
+++ b/builds/msvc/c_local_lat/c_local_lat.vcproj
@@ -166,6 +166,10 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
+ RelativePath="..\..\..\perf\helpers.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\perf\local_lat.cpp"
>
</File>
diff --git a/builds/msvc/c_local_thr/c_local_thr.vcproj b/builds/msvc/c_local_thr/c_local_thr.vcproj
index 38425cc..5d5b9b1 100644
--- a/builds/msvc/c_local_thr/c_local_thr.vcproj
+++ b/builds/msvc/c_local_thr/c_local_thr.vcproj
@@ -166,6 +166,10 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
+ RelativePath="..\..\..\perf\helpers.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\perf\local_thr.cpp"
>
</File>
diff --git a/builds/msvc/c_remote_lat/c_remote_lat.vcproj b/builds/msvc/c_remote_lat/c_remote_lat.vcproj
index 5bce7e9..81e56a0 100644
--- a/builds/msvc/c_remote_lat/c_remote_lat.vcproj
+++ b/builds/msvc/c_remote_lat/c_remote_lat.vcproj
@@ -166,6 +166,10 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
+ RelativePath="..\..\..\perf\helpers.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\perf\remote_lat.cpp"
>
</File>
diff --git a/builds/msvc/c_remote_thr/c_remote_thr.vcproj b/builds/msvc/c_remote_thr/c_remote_thr.vcproj
index 1089549..a1e465a 100644
--- a/builds/msvc/c_remote_thr/c_remote_thr.vcproj
+++ b/builds/msvc/c_remote_thr/c_remote_thr.vcproj
@@ -166,6 +166,10 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
+ RelativePath="..\..\..\perf\helpers.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\perf\remote_thr.cpp"
>
</File>
diff --git a/foreign/xmlParser/xmlParser.cpp b/foreign/xmlParser/xmlParser.cpp
index bccfaf7..ccb1e17 100644
--- a/foreign/xmlParser/xmlParser.cpp
+++ b/foreign/xmlParser/xmlParser.cpp
@@ -421,7 +421,7 @@ XMLNode XMLNode::openFileHelper(XMLCSTR filename, XMLCSTR tag)
// create message
char message[2000],*s1=(char*)"",*s3=(char*)""; XMLCSTR s2=_CXML("");
if (pResults.error==eXMLErrorFirstTagNotFound) { s1=(char*)"First Tag should be '"; s2=tag; s3=(char*)"'.\n"; }
- snprintf(message,2000,
+ sprintf(message,
#ifdef _XMLWIDECHAR
"XML Parsing error inside file '%S'.\n%S\nAt line %i, column %i.\n%s%S%s"
#else
diff --git a/perf/helpers.cpp b/perf/helpers.cpp
index 71a38e2..ddf1e45 100644
--- a/perf/helpers.cpp
+++ b/perf/helpers.cpp
@@ -19,9 +19,7 @@
#include <assert.h>
#include <stdlib.h>
-#ifdef _WIN32
-# include <windows.h>
-#else
+#ifndef _WIN32
# include <sys/time.h>
# include <unistd.h>
#endif