Check for C99 before using inline. Fixes armon#5

petriewong · Feb 27, 2014 · 7a75bab · 7a75bab
1 parent 9b4866c
commit 7a75bab
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/art.c b/src/art.c
@@ -118,7 +118,7 @@ int destroy_art_tree(art_tree *t) {
 /**
  * Returns the size of the ART tree.
  */
-extern inline uint64_t art_size(art_tree *t);
+extern INLINE uint64_t art_size(art_tree *t);
 
 static art_node** find_child(art_node *n, unsigned char c) {
     int i, mask, bitfield;
@@ -180,7 +180,7 @@ static art_node** find_child(art_node *n, unsigned char c) {
 }
 
 // Simple inlined if
-static inline int min(int a, int b) {
+static INLINE int min(int a, int b) {
     return (a < b) ? a : b;
 }
 

diff --git a/src/art.h b/src/art.h
@@ -2,6 +2,12 @@
 #ifndef ART_H
 #define ART_H
 
+#if __STDC_VERSION__ >= 199901L
+#define INLINE inline
+#else
+#define INLINE
+#endif
+
 #define NODE4   1
 #define NODE16  2
 #define NODE48  3
@@ -91,7 +97,7 @@ int destroy_art_tree(art_tree *t);
 /**
  * Returns the size of the ART tree.
  */
-inline uint64_t art_size(art_tree *t) {
+INLINE uint64_t art_size(art_tree *t) {
     return t->size;
 }