From 47e47e676099dc79e64af7730f157e988e43c5ba Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Mon, 12 Jan 2015 15:36:18 +0500
Subject: Avoid type re-definition for as long C11 is explicitly enabled in
 compilers

---
 source/blender/blenkernel/BKE_customdata.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h
index 08edde1cec0..f11aad27e4b 100644
--- a/source/blender/blenkernel/BKE_customdata.h
+++ b/source/blender/blenkernel/BKE_customdata.h
@@ -373,10 +373,10 @@ void CustomData_external_reload(struct CustomData *data,
 /* Mesh-to-mesh transfer data. */
 
 struct MeshPairRemap;
-typedef struct CustomDataTransferLayerMap CustomDataTransferLayerMap;
+struct CustomDataTransferLayerMap;
 
 typedef void (*cd_datatransfer_interp)(
-        const CustomDataTransferLayerMap *laymap, void *dest,
+        const struct CustomDataTransferLayerMap *laymap, void *dest,
         void **sources, const float *weights, const int count, const float mix_factor);
 
 /**
@@ -423,7 +423,7 @@ enum {
 };
 
 typedef struct CustomDataTransferLayerMap {
-	CustomDataTransferLayerMap *next, *prev;
+	struct CustomDataTransferLayerMap *next, *prev;
 
 	int data_type;
 	int mix_mode;
-- 
cgit v1.2.3