From ce7b0a51f1eae12e0f4b8d206d1c4f06d4348786 Mon Sep 17 00:00:00 2001 From: Sean Bright Date: Thu, 21 Jan 2010 15:27:42 +0000 Subject: [PATCH] Merged revisions 241932 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r241932 | seanbright | 2010-01-21 10:25:46 -0500 (Thu, 21 Jan 2010) | 5 lines Fix configure check for PTHREAD_ONCE_INIT when manually adding -Wall to CFLAGS. (closes issue #16666) Reported by: romain_proformatique ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@241938 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- configure | 3 ++- configure.ac | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 814cdfa65a..644a902e09 100755 --- a/configure +++ b/configure @@ -13491,10 +13491,11 @@ CFLAGS="${CFLAGS} -Werror -Wmissing-braces" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include + void empty(){} int main () { -pthread_once_t once = PTHREAD_ONCE_INIT; +pthread_once_t once = PTHREAD_ONCE_INIT; pthread_once(&once, empty); ; return 0; } diff --git a/configure.ac b/configure.ac index e25f26d7c9..15d777dbdd 100644 --- a/configure.ac +++ b/configure.ac @@ -533,8 +533,9 @@ saved_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} -Werror -Wmissing-braces" AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( - [#include ], - [pthread_once_t once = PTHREAD_ONCE_INIT;]) + [#include + void empty(){}], + [pthread_once_t once = PTHREAD_ONCE_INIT; pthread_once(&once, empty);]) ],[ AC_MSG_RESULT(no) ac_cv_pthread_once_needsbraces="no"