[Bf-blender-cvs] [d24bafa] master: Cleanup: BLO: use proper typedef for expand_doit callback.

[Bastien Montagne]

Commit: d24bafa0d5b0f1f833145524b7073a513a272b17
Author: Bastien Montagne
Date:   Mon Oct 12 14:31:47 2015 +0200
Branches: master
https://developer.blender.org/rBd24bafa0d5b0f1f833145524b7073a513a272b17

Cleanup: BLO: use proper typedef for expand_doit callback.

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

M	source/blender/blenloader/BLO_readfile.h
M	source/blender/blenloader/intern/readfile.c

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

diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h
index 44c6d27..eda76ec 100644
--- a/source/blender/blenloader/BLO_readfile.h
+++ b/source/blender/blenloader/BLO_readfile.h
@@ -110,7 +110,9 @@ BlendFileData *blo_read_blendafterruntime(int file, const char *name, int actual
 /* internal function but we need to expose it */
 void blo_lib_link_screen_restore(struct Main *newmain, struct bScreen *curscreen, struct Scene *curscene);
 
-void BLO_main_expander(void (*expand_doit_func)(void *, struct Main *, void *));
+typedef void (*BLOExpandDoitCallback) (void *fdhandle, struct Main *mainvar, void *idv);
+
+void BLO_main_expander(BLOExpandDoitCallback expand_doit_func);
 void BLO_expand_main(void *fdhandle, struct Main *mainvar);
 
 /* Update defaults in startup.blend & userprefs.blend, without having to save and embed it */
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index b4965da..721878d 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -8624,7 +8624,7 @@ static void expand_doit_library(void *fdhandle, Main *mainvar, void *old)
 	}
 }
 
-static void (*expand_doit)(void *, Main *, void *);
+static BLOExpandDoitCallback expand_doit;
 
 // XXX deprecated - old animation system
 static void expand_ipo(FileData *fd, Main *mainvar, Ipo *ipo)
@@ -9404,7 +9404,7 @@ static void expand_gpencil(FileData *fd, Main *mainvar, bGPdata *gpd)
  *
  * \param expand_doit_func Called for each ID block it finds.
  */
-void BLO_main_expander(void (*expand_doit_func)(void *, Main *, void *))
+void BLO_main_expander(BLOExpandDoitCallback expand_doit_func)
 {
 	expand_doit = expand_doit_func;
 }