Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Better Clang compatibility

Browse source
This commit is contained in:
Pavel Tvrdik 2014-12-05 09:25:38 +01:00 committed by Ondrej Zajicek
parent 7d37bf79de
commit 85a3639d99
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/lists.h
View file

@ -50,6 +50,14 @@ typedef struct list { /* In fact two overlayed nodes */
#define EMPTY_LIST(list) (!(list).head->next) #define EMPTY_LIST(list) (!(list).head->next)
#ifndef _BIRD_LISTS_C_
#define LIST_INLINE static inline
#include "lib/lists.c"
#undef LIST_INLINE
#else /* _BIRD_LISTS_C_ */
#define LIST_INLINE
void add_tail(list *, node *); void add_tail(list *, node *);
void add_head(list *, node *); void add_head(list *, node *);
void rem_node(node *); void rem_node(node *);
@ -57,13 +65,6 @@ void rem2_node(node *);
void add_tail_list(list *, list *); void add_tail_list(list *, list *);
void init_list(list *); void init_list(list *);
void insert_node(node *, node *); void insert_node(node *, node *);
#ifndef _BIRD_LISTS_C_
#define LIST_INLINE extern inline
#include "lib/lists.c"
#undef LIST_INLINE
#else
#define LIST_INLINE
#endif #endif
#endif #endif

2
tools/mergedirs
View file

@ -4,7 +4,7 @@ if [ -z "$4" ] ; then
echo "Usage: mergedirs <src-dir> <src-dir-rel> <obj-dir> <list-of-dirs>" echo "Usage: mergedirs <src-dir> <src-dir-rel> <obj-dir> <list-of-dirs>"
exit 1 exit 1
fi fi
cpp=${CPP:-gcc -E} cpp=${CPP:-cc -E}
SRCDIR=$1 SRCDIR=$1
shift shift
SRCREL=$1 SRCREL=$1