kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 02:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 241938 via svnmerge from

Browse Source 
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
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@241939 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2010-01-21 15:31:02 +00:00
parent 431a247538
commit e993d100ab
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.ac Revision: 235657 .
# From configure.ac Revision: 236633 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.64 for asterisk 1.6.
#
@@ -12596,10 +12596,11 @@ CFLAGS="${CFLAGS} -Werror -Wmissing-braces"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <pthread.h>
void empty(){}
int
main ()
{
pthread_once_t once = PTHREAD_ONCE_INIT;
pthread_once_t once = PTHREAD_ONCE_INIT; pthread_once(&once, empty);
;
return 0;
}

5
configure.ac
View File

@@ -481,8 +481,9 @@ saved_CFLAGS="${CFLAGS}"
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"