solstice

commit 3450ae062ccd601b3ddf576b3cdb1ce9c668d084
parent 1b17bfa40784a802080970c8d094fc993ea21871
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue, 29 Nov 2016 11:08:02 +0100

Fix a duplicated dynamic array declaration

Diffstat:
M
src/core/solstice_core_node.h
 | 
6
++----
M
src/core/solstice_core_scene.h
 | 
12
++----------

2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/src/core/solstice_core_node.h b/src/core/solstice_core_node.h
@@ -18,17 +18,15 @@
 
 #include <solstice/sanim.h>
 
+#include <rsys/dynamic_array.h>
 #include <rsys/ref_count.h>
 
-#ifndef SOLSTICE_DARRAY_NODES
-#define SOLSTICE_DARRAY_NODES
-#include <rsys/dynamic_array.h>
 struct sanim_node;
+
 /* Define the darray_nodes data structure */
 #define DARRAY_NAME nodes
 #define DARRAY_DATA struct sanim_node*
 #include <rsys/dynamic_array.h>
-#endif
 
 struct score_device;
 struct score_node;
diff --git a/src/core/solstice_core_scene.h b/src/core/solstice_core_scene.h
@@ -16,19 +16,11 @@
 #ifndef SCORE_SCENE_H
 #define SCORE_SCENE_H
 
-#include <rsys/ref_count.h>
-
 #include "solstice_core.h"
+#include "solstice_core_node.h"
 
-#ifndef SOLSTICE_DARRAY_NODES
-#define SOLSTICE_DARRAY_NODES
 #include <rsys/dynamic_array.h>
-struct sanim_node;
-/* Define the darray_nodes data structure */
-#define DARRAY_NAME nodes
-#define DARRAY_DATA struct sanim_node*
-#include <rsys/dynamic_array.h>
-#endif
+#include <rsys/ref_count.h>
 
 struct ssol_scene;
 struct ssol_sun;