[Bf-blender-cvs] [4c95dc5a1b2] blenloader-api: fix api

[Jacques Lucke]

Commit: 4c95dc5a1b2a04295e3157721fb46c65667cd40d
Author: Jacques Lucke
Date:   Sat Mar 7 12:51:27 2020 +0100
Branches: blenloader-api
https://developer.blender.org/rB4c95dc5a1b2a04295e3157721fb46c65667cd40d

fix api

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

M	source/blender/blenloader/BLO_writefile.h
M	source/blender/blenloader/intern/readfile.c
M	source/blender/blenloader/intern/writefile.c

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

diff --git a/source/blender/blenloader/BLO_writefile.h b/source/blender/blenloader/BLO_writefile.h
index 210385b8a20..eee76b14904 100644
--- a/source/blender/blenloader/BLO_writefile.h
+++ b/source/blender/blenloader/BLO_writefile.h
@@ -55,11 +55,11 @@ void BLO_write_struct_array_by_id(BloWriter *writer,
                                   int array_size);
 
 int BLO_get_struct_id_by_name(BloWriter *writer, const char *struct_name);
-#define BLO_get_struct_id(writer, struct_name) BLO_get_struct_id_by_name(writer, ##struct_name)
+#define BLO_get_struct_id(writer, struct_name) BLO_get_struct_id_by_name(writer, #struct_name)
 
 #define BLO_write_struct(writer, struct_name, data_ptr) \
-  BLO_write_struct_by_id(writer, BLO_get_struct_id(struct_name), data_ptr)
+  BLO_write_struct_by_id(writer, BLO_get_struct_id(writer, struct_name), data_ptr)
 #define BLO_write_struct_array(writer, struct_name, data_ptr, array_size) \
-  BLO_write_struct_array_by_id(writer, BLO_get_struct_id(struct_name), data_ptr, array_size)
+  BLO_write_struct_array_by_id(writer, BLO_get_struct_id(writer, struct_name), data_ptr, array_size)
 
 #endif
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 3deae368ee0..231e0d19cf1 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -702,6 +702,11 @@ static Main *blo_find_main(FileData *fd, const char *filepath, const char *relab
 /** \name File Parsing
  * \{ */
 
+static BloReader *wrap_reader(FileData *fd)
+{
+  return (BloReader *)fd;
+}
+
 static void switch_endian_bh4(BHead4 *bhead)
 {
   /* the ID_.. codes */
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 48939b641b6..bbdcf70212f 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -381,6 +381,11 @@ static void writedata_free(WriteData *wd)
   MEM_freeN(wd);
 }
 
+static BloWriter *wrap_writer(WriteData *wd)
+{
+  return (BloWriter *)wd;
+}
+
 /** \} */
 
 /* -------------------------------------------------------------------- */