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

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@236714 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/ast_expr2.c b/main/ast_expr2.c
index b7b533e7a3a4bf4bf1951c32db931397f695d13e..6358700e866c66e1851cd1b44a5c036238b52055 100644 (file)
--- a/main/ast_expr2.c
+++ b/main/ast_expr2.c
@@ -235,10 +235,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #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

diff --git a/main/ast_expr2.y b/main/ast_expr2.y
index 02cd746579e22a2059c21d9bfda2bc12abfcbaa3..2e109e57a8413f16c25214837fb59ddc5abf1045 100644 (file)
--- a/main/ast_expr2.y
+++ b/main/ast_expr2.y
@@ -106,10 +106,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #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