From: Jason Parker <jparker@digium.com>
Date: Mon, 28 Dec 2009 22:11:07 +0000 (+0000)
Subject: Merged revisions 236713 via svnmerge from
X-Git-Tag: 1.6.1.13-rc1~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39a460f82c72d49484c8a29611f0594becc8dac3;p=thirdparty%2Fasterisk.git

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.1@236715 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/ast_expr2.c b/main/ast_expr2.c
index 44b0b7ece8..c313a91df7 100644
--- a/main/ast_expr2.c
+++ b/main/ast_expr2.c
@@ -237,10 +237,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 dc90aaa571..10e207e8c1 100644
--- 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