[asterisk-commits] seanbright: branch 1.6.1 r241940 - in /branches/1.6.1: ./ configure configure.ac

[SVN commits to the Asterisk project]

Author: seanbright
Date: Thu Jan 21 09:31:43 2010
New Revision: 241940

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=241940
Log:
Merged revisions 241938 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r241938 | seanbright | 2010-01-21 10:27:42 -0500 (Thu, 21 Jan 2010) | 12 lines
  
  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
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/configure
    branches/1.6.1/configure.ac

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/configure.ac
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/configure.ac?view=diff&rev=241940&r1=241939&r2=241940
==============================================================================
--- branches/1.6.1/configure.ac (original)
+++ branches/1.6.1/configure.ac Thu Jan 21 09:31:43 2010
@@ -479,8 +479,9 @@
 CFLAGS="${CFLAGS} -Werror -Wmissing-braces"
 AC_COMPILE_IFELSE(
   [AC_LANG_PROGRAM(
-    [#include <pthread.h>],
-	[pthread_once_t once = PTHREAD_ONCE_INIT;])
+    [#include <pthread.h>
+     void empty(){}],
+	[pthread_once_t once = PTHREAD_ONCE_INIT; pthread_once(&once, empty);])
   ],[
     AC_MSG_RESULT(no)
     ac_cv_pthread_once_needsbraces="no"