From 5d4a6a94ef40f8ae8c49d8fd8fc65384324cb03c Mon Sep 17 00:00:00 2001
From: Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Date: Thu, 17 Apr 2014 12:25:41 +0900
Subject: Freestyle: Fix for VC++ warnings about 'hypot' macro redefinitions
 (Part 2).

(See commit e1771e72fbbf828dbf5bed871b814288389f3611 for more detail of
the problem).

Fixed for #include <Python.h> not properly put in the extern "C" { ... } construct.

Also removed redundant inclusion of the header file in the Freestyle Python API code.
---
 source/blender/freestyle/intern/python/BPy_Id.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source/blender/freestyle/intern/python/BPy_Id.h')

diff --git a/source/blender/freestyle/intern/python/BPy_Id.h b/source/blender/freestyle/intern/python/BPy_Id.h
index d4b635a4ea5..62e480628e3 100644
--- a/source/blender/freestyle/intern/python/BPy_Id.h
+++ b/source/blender/freestyle/intern/python/BPy_Id.h
@@ -25,7 +25,10 @@
 #ifndef __FREESTYLE_PYTHON_ID_H__
 #define __FREESTYLE_PYTHON_ID_H__
 
+extern "C" {
 #include <Python.h>
+}
+
 #include <iostream>
 
 using namespace std;
-- 
cgit v1.2.3