Avoid type re-definition for as long C11 is explicitly enabled in compilers
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 12 Jan 2015 10:36:18 +0000 (15:36 +0500)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 12 Jan 2015 10:36:18 +0000 (15:36 +0500)
source/blender/blenkernel/BKE_customdata.h

index 08edde1cec09704f1f5840640b8896836557aedb..f11aad27e4bb247e97a2e49d18cbebfc626663b2 100644 (file)
@@ -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;