[Forensics-changes] [yara] 62/192: Fix isnan already defined

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag v3.6.0
in repository yara.

commit d30c11c7c85ede9edb8e3bcfaf14aa9300e9076d
Author: Assaf Nativ <nativ.assaf at gmail.com>
Date:   Sat Nov 5 01:49:53 2016 +0200

    Fix isnan already defined
    
    In recent vs15 compailer isnan function is already defined, so I wrapped
    the definition with #ifndef
---
 libyara/include/yara/object.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libyara/include/yara/object.h b/libyara/include/yara/object.h
index a8294e5..988c0f1 100644
--- a/libyara/include/yara/object.h
+++ b/libyara/include/yara/object.h
@@ -33,7 +33,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifdef _MSC_VER
 
 #include <float.h>
+#ifndef isnan
 #define isnan _isnan
+#endif
 
 #ifndef INFINITY
 #define INFINITY (DBL_MAX + DBL_MAX)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git