[asterisk-commits] kharwell: trunk r406789 - in /trunk: ./ include/asterisk/ res/res_pjsip/include/

[SVN commits to the Asterisk project]

Author: kharwell
Date: Tue Jan 28 14:47:15 2014
New Revision: 406789

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=406789
Log:
res_pjsip,compat: INFINITY and NAN undefined

On some systems the values for INFINITY and NAN are not defined thus causing
a build error on those systems.  Added definitions for those if they had
not previously been defined.

(closes issue ASTERISK-23056)
Reported by: capouch
Patches:
     inf-nan-patch.txt uploaded by capouch (license 6564)
........

Merged revisions 406788 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/compat.h
    trunk/res/res_pjsip/include/res_pjsip_private.h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/include/asterisk/compat.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/compat.h?view=diff&rev=406789&r1=406788&r2=406789
==============================================================================
--- trunk/include/asterisk/compat.h (original)
+++ trunk/include/asterisk/compat.h Tue Jan 28 14:47:15 2014
@@ -224,4 +224,12 @@
 #endif
 #endif
 
-#endif
+#ifndef INFINITY
+#define INFINITY (1.0/0.0)
+#endif
+
+#ifndef NAN
+#define NAN (0.0/0.0)
+#endif
+
+#endif

Modified: trunk/res/res_pjsip/include/res_pjsip_private.h
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip/include/res_pjsip_private.h?view=diff&rev=406789&r1=406788&r2=406789
==============================================================================
--- trunk/res/res_pjsip/include/res_pjsip_private.h (original)
+++ trunk/res/res_pjsip/include/res_pjsip_private.h Tue Jan 28 14:47:15 2014
@@ -9,6 +9,7 @@
 #define RES_PJSIP_PRIVATE_H_
 
 #include "asterisk/module.h"
+#include "asterisk/compat.h"
 
 struct ao2_container;
 struct ast_threadpool_options;