[svn-commits] qwell: branch 1.6.0 r236714 - in /branches/1.6.0: ./ main/

[SVN commits to the Digium repositories]

Author: qwell
Date: Mon Dec 28 16:10:40 2009
New Revision: 236714

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

........
  r236713 | qwell | 2009-12-28 16:09:40 -0600 (Mon, 28 Dec 2009) | 8 lines
  
  Allow "REMAINDER" to function properly in expressions.
  
  (closes issue #16427)
  Reported by: wdoekes
  Patches:
        ast16-reminder-remainder.patch uploaded by wdoekes (license 717)
  Tested by: wdoekes
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/ast_expr2.c
    branches/1.6.0/main/ast_expr2.y

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

Modified: branches/1.6.0/main/ast_expr2.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/ast_expr2.c?view=diff&rev=236714&r1=236713&r2=236714
==============================================================================
--- branches/1.6.0/main/ast_expr2.c (original)
+++ branches/1.6.0/main/ast_expr2.c Mon Dec 28 16:10:40 2009
@@ -235,10 +235,10 @@
 #define FUNC_LOG	(long double)log
 #endif
 
-#ifdef HAVE_REMINDERL
-#define FUNC_REMINDER   reminderl
-#elif defined(HAVE_REMINDER)
-#define FUNC_REMINDER	(long double)reminder
+#ifdef HAVE_REMAINDERL
+#define FUNC_REMAINDER   remainderl
+#elif defined(HAVE_REMAINDER)
+#define FUNC_REMAINDER	(long double)remainder
 #endif
 
 #ifdef HAVE_FMODL

Modified: branches/1.6.0/main/ast_expr2.y
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/ast_expr2.y?view=diff&rev=236714&r1=236713&r2=236714
==============================================================================
--- branches/1.6.0/main/ast_expr2.y (original)
+++ branches/1.6.0/main/ast_expr2.y Mon Dec 28 16:10:40 2009
@@ -106,10 +106,10 @@
 #define FUNC_LOG	(long double)log
 #endif
 
-#ifdef HAVE_REMINDERL
-#define FUNC_REMINDER   reminderl
-#elif defined(HAVE_REMINDER)
-#define FUNC_REMINDER	(long double)reminder
+#ifdef HAVE_REMAINDERL
+#define FUNC_REMAINDER   remainderl
+#elif defined(HAVE_REMAINDER)
+#define FUNC_REMAINDER	(long double)remainder
 #endif
 
 #ifdef HAVE_FMODL