[asterisk-commits] may: branch may/ooh323_qsig r376385 - in /team/may/ooh323_qsig: ./ utils/

[SVN commits to the Asterisk project]

Author: may
Date: Fri Nov 16 10:47:21 2012
New Revision: 376385

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=376385
Log:
Multiple revisions 376344-376345

........
  r376344 | dlee | 2012-11-16 04:14:00 +0400 (Fri, 16 Nov 2012) | 1 line
  
  Somehow I put in svn-1.6 merge information. Oops.
........
  r376345 | dlee | 2012-11-16 04:15:30 +0400 (Fri, 16 Nov 2012) | 15 lines
  
  Fixed extconf.c breakage introduced in r376306.
  
  To quote wdoekes:
  > Note that I'm not confirming legitimacy of having that file in tree at
  > all. Is anyone using aelparse/conf2ael?
  ........
  
  Merged revisions 376340 from http://svn.asterisk.org/svn/asterisk/branches/1.8
  ........
  
  Merged revisions 376342 from http://svn.asterisk.org/svn/asterisk/branches/10
  ........
  
  Merged revisions 376343 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 376344-376345 from http://svn.asterisk.org/svn/asterisk/trunk

Modified:
    team/may/ooh323_qsig/   (props changed)
    team/may/ooh323_qsig/utils/extconf.c

Propchange: team/may/ooh323_qsig/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Propchange: team/may/ooh323_qsig/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 16 10:47:21 2012
@@ -1,3 +1,1 @@
-/branches/11:372696
-/team/mmichelson/private/phones-trunk:358764-361321
-/trunk:357542,368181-369527,369613,376341
+/trunk:376342-376345

Propchange: team/may/ooh323_qsig/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Nov 16 10:47:21 2012
@@ -1,1 +1,1 @@
-/trunk:1-376317,376341
+/trunk:1-376384

Modified: team/may/ooh323_qsig/utils/extconf.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_qsig/utils/extconf.c?view=diff&rev=376385&r1=376384&r2=376385
==============================================================================
--- team/may/ooh323_qsig/utils/extconf.c (original)
+++ team/may/ooh323_qsig/utils/extconf.c Fri Nov 16 10:47:21 2012
@@ -168,6 +168,7 @@
 #define LOG_DTMF    __LOG_DTMF, _A_
 
 /* lock.h */
+#define _ASTERISK_LOCK_H /* A small indication that this is horribly wrong. */
 
 #ifndef	HAVE_MTX_PROFILE
 #define	__MTX_PROF(a)	return pthread_mutex_lock((a))