[Bf-blender-cvs] [97db5aa077a] greasepencil-object: GPencil: Fix errors after merge

[Antonio Vazquez]

Commit: 97db5aa077a9059ac18ca3537b4d4fecc50354af
Author: Antonio Vazquez
Date:   Mon Mar 2 16:29:31 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB97db5aa077a9059ac18ca3537b4d4fecc50354af

GPencil: Fix errors after merge

===================================================================

M	source/blender/blenkernel/BKE_gpencil.h

===================================================================

diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index ce94017f3c4..f4dc476d975 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -332,9 +332,6 @@ void BKE_gpencil_visible_stroke_iter(struct Object *ob,
 extern void (*BKE_gpencil_batch_cache_dirty_tag_cb)(struct bGPdata *gpd);
 extern void (*BKE_gpencil_batch_cache_free_cb)(struct bGPdata *gpd);
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 void BKE_gpencil_frame_original_pointers_update(const struct bGPDframe *gpf_orig,
                                                 const struct bGPDframe *gpf_eval);
 void BKE_gpencil_update_orig_pointers(const struct Object *ob_orig, const struct Object *ob_eval);