summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorHib Eris <hib@hiberis.nl>2013-04-14 16:37:14 +0200
committerAlbert Astals Cid <aacid@kde.org>2013-04-14 16:37:27 +0200
commit62a5b4d5c6d5c368d190b86eab63ccb07d642c01 (patch)
treebd1fc458d2554e42fc7291d1bddef7703224638a /test
parent5bc00809ebe560a180d5df93eb50bdf0ff0e97e6 (diff)
Check for strcpy_s() and strcat_s() at configure time
It is better to test for functions than to hardcode exceptions for specific compilers. This fixes compiling poppler with the latest mingw-w64 compiler which has strcpy_s() and strcat_s() build in. Bug #63459
Diffstat (limited to 'test')
-rw-r--r--test/perf-test.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/perf-test.cc b/test/perf-test.cc
index 21fbdeed..cb97bcf1 100644
--- a/test/perf-test.cc
+++ b/test/perf-test.cc
@@ -1,5 +1,5 @@
/* Copyright Krzysztof Kowalczyk 2006-2007
- Copyright Hib Eris <hib@hiberis.nl> 2008
+ Copyright Hib Eris <hib@hiberis.nl> 2008, 2013
License: GPLv2 */
/*
A tool to stress-test poppler rendering and measure rendering times for
@@ -325,7 +325,7 @@ void sleep_milliseconds(int milliseconds)
#endif
}
-#ifndef _MSC_VER
+#ifndef HAVE_STRCPY_S
void strcpy_s(char* dst, size_t dst_size, const char* src)
{
size_t src_size = strlen(src) + 1;
@@ -338,7 +338,9 @@ void strcpy_s(char* dst, size_t dst_size, const char* src)
}
}
}
+#endif
+#ifndef HAVE_STRCAT_S
void strcat_s(char *dst, size_t dst_size, const char* src)
{
size_t dst_len = strlen(dst);