Commit 62a5b4d5 authored by Hib Eris's avatar Hib Eris Committed by Albert Astals Cid

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
parent 5bc00809
......@@ -34,6 +34,8 @@ check_function_exists(popen HAVE_POPEN)
check_function_exists(mkstemp HAVE_MKSTEMP)
check_function_exists(mkstemps HAVE_MKSTEMPS)
check_function_exists(rand_r HAVE_RAND_R)
check_function_exists(strcpy_s HAVE_STRCPY_S)
check_function_exists(strcat_s HAVE_STRCAT_S)
macro(CHECK_FOR_DIR include var)
check_c_source_compiles(
......
......@@ -251,6 +251,7 @@ fi
dnl ##### Checks for library functions.
AC_CHECK_FUNCS(popen mkstemp mkstemps)
AC_CHECK_FUNCS(strcpy_s strcat_s)
dnl ##### Back to C for the library tests.
AC_LANG_C
......
/* 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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment