From b274d18aec525621bcb0a2234fc65e09398616c2 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Tue, 28 Jul 2020 16:32:30 +0200 Subject: Cleanup: correct usage of extern-C blocks in various places This removes extern-C blocks around other includes and adds such blocks for some headers that need them. --- source/blender/freestyle/intern/system/PythonInterpreter.h | 2 -- source/blender/freestyle/intern/system/RenderMonitor.h | 2 -- source/blender/freestyle/intern/system/StringUtils.h | 2 -- 3 files changed, 6 deletions(-) (limited to 'source/blender/freestyle/intern/system') diff --git a/source/blender/freestyle/intern/system/PythonInterpreter.h b/source/blender/freestyle/intern/system/PythonInterpreter.h index 4bc6ba9db38..8099ed63199 100644 --- a/source/blender/freestyle/intern/system/PythonInterpreter.h +++ b/source/blender/freestyle/intern/system/PythonInterpreter.h @@ -34,7 +34,6 @@ extern "C" { #include "MEM_guardedalloc.h" // soc -extern "C" { #include "DNA_text_types.h" #include "BKE_context.h" @@ -47,7 +46,6 @@ extern "C" { #include "BPY_extern.h" #include "bpy_capi_utils.h" -} namespace Freestyle { diff --git a/source/blender/freestyle/intern/system/RenderMonitor.h b/source/blender/freestyle/intern/system/RenderMonitor.h index 709df6c2d8e..eef4683328b 100644 --- a/source/blender/freestyle/intern/system/RenderMonitor.h +++ b/source/blender/freestyle/intern/system/RenderMonitor.h @@ -22,9 +22,7 @@ * \brief Classes defining the basic "Iterator" design pattern */ -extern "C" { #include "render_types.h" -} #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" diff --git a/source/blender/freestyle/intern/system/StringUtils.h b/source/blender/freestyle/intern/system/StringUtils.h index aeacddd64c8..fd97ca5b032 100644 --- a/source/blender/freestyle/intern/system/StringUtils.h +++ b/source/blender/freestyle/intern/system/StringUtils.h @@ -28,10 +28,8 @@ #include #include -extern "C" { #include "BLI_path_util.h" #include "BLI_string.h" -} using namespace std; -- cgit v1.2.3