Merge commit '9495cd170b5786c3518419e873d94eb5e7ada11a'

* commit '9495cd170b5786c3518419e873d94eb5e7ada11a':
  configure: Fix check_exec_crash for ICL support

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 2 insertions, 2 deletions

diff --git a/configure b/configure
index faf318644a..6d09fa62ac 100755
--- a/configure
+++ b/configure
@@ -1014,10 +1014,10 @@ check_exec_crash(){
 static void sighandler(int sig){
     raise(SIGTERM);
 }
-int func(void){
+int foo(void){
     $code
 }
-int (*func_ptr)(void) = func;
+int (*func_ptr)(void) = foo;
 int main(void){
     signal(SIGILL, sighandler);
     signal(SIGFPE, sighandler);