Merge branch 'master' into brian

[satune.git] / src / Collections / array.h

diff --git a/src/Collections/array.h b/src/Collections/array.h
index d0841587608bfb792a2d0b412499e9138938c801..73d0c32124a7cb873724179c2001aeeaa90103e4 100644 (file)
--- a/src/Collections/array.h
+++ b/src/Collections/array.h
@@ -7,41 +7,41 @@
                uint size;                                                                                                                                                                                                                                      \
        };                                                                    \
        typedef struct Array ## name Array ## name;                                                                                                             \
-       inline Array ## name * allocArray ## name(uint size) {                                                          \
+       static inline Array ## name * allocArray ## name(uint size) {                                                           \
                Array ## name * tmp = (Array ## name *)ourmalloc(sizeof(type));                 \
                tmp->size = size;                                                                                                                                                                                                               \
                tmp->array = (type *) ourcalloc(1, sizeof(type) * size);                                                \
                return tmp;                                                         \
        }                                                                     \
-       inline Array ## name * allocArrayInit ## name(type * array, uint size)  { \
+       static inline Array ## name * allocArrayInit ## name(type * array, uint size)  { \
                Array ## name * tmp = allocArray ## name(size);                                                                                 \
                memcpy(tmp->array, array, size * sizeof(type));                                                                                 \
                return tmp;                                                         \
        }                                                                     \
-       inline type getArray ## name(Array ## name * This, uint index) {                        \
+       static inline type getArray ## name(Array ## name * This, uint index) {                 \
                return This->array[index];                                                                                                                                                                      \
        }                                                                     \
-       inline void setArray ## name(Array ## name * This, uint index, type item) {     \
+       static inline void setArray ## name(Array ## name * This, uint index, type item) {      \
                This->array[index]=item;                                                                                                                                                                                \
        }                                                                     \
-       inline uint getSizeArray ## name(Array ## name *This) {                                                         \
+       static inline uint getSizeArray ## name(Array ## name *This) {                                                          \
                return This->size;                                                                                                                                                                                                      \
        }                                                                     \
-       inline void deleteArray ## name(Array ## name *This) {                                                          \
+       static inline void deleteArray ## name(Array ## name *This) {                                                           \
                ourfree(This->array);                                                                                                                                                                                           \
                ourfree(This);                                                                                                                                                                                                                  \
        }                                                                     \
-       inline type * exposeCArray ## name(Array ## name * This) {                                                      \
+       static inline type * exposeCArray ## name(Array ## name * This) {                                                       \
                return This->array;                                                                                                                                                                                                     \
        }                                                                                                                                                                                                                                                                                       \
-       inline void deleteInlineArray ## name(Array ## name *This) {                                    \
+       static inline void deleteInlineArray ## name(Array ## name *This) {                                     \
                ourfree(This->array);                                                                                                                                                                                           \
        }                                                                                                                                                                                                                                                                                       \
-       inline void allocInlineArray ## name(Array ## name * This, uint size) {                 \
+       static inline void allocInlineArray ## name(Array ## name * This, uint size) {                  \
                This->size = size;                                                                                                                                                                                                      \
                This->array = (type *) ourcalloc(1, sizeof(type) * size);                                               \
        }                                                                                                                                                                                                                                                                                       \
-       inline void allocInlineArrayInit ## name(Array ## name * This, type *array, uint size) { \
+       static inline void allocInlineArrayInit ## name(Array ## name * This, type *array, uint size) { \
                allocInlineArray ##name(This, size);                                                                                                                            \
                memcpy(This->array, array, size * sizeof(type));                                                                                \
        }