[Bf-blender-cvs] [47e47e6] master: Avoid type re-definition for as long C11 is explicitly enabled in compilers

[Sergey Sharybin]

Commit: 47e47e676099dc79e64af7730f157e988e43c5ba
Author: Sergey Sharybin
Date:   Mon Jan 12 15:36:18 2015 +0500
Branches: master
https://developer.blender.org/rB47e47e676099dc79e64af7730f157e988e43c5ba

Avoid type re-definition for as long C11 is explicitly enabled in compilers

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

M       source/blender/blenkernel/BKE_customdata.h

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

diff --git a/source/blender/blenkernel/BKE_customdata.h 
b/source/blender/blenkernel/BKE_customdata.h
index 08edde1..f11aad2 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;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs