alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[iface/nips/nips_vm]

Browse source 
Fix compilation with Clang.

* state.c: Do not include state_inline.h twice with different
value of STATE_INLINE.  It was included once via state.h with
STATE_INLINE = "extern inline", and another time directly with
STATE_INLINE = "extern". Now...
* state.h: ... only include it once here with STATE_INLINE =
"static inline".
This commit is contained in:
Alexandre Duret-Lutz 2010-11-27 14:31:04 +01:00
parent 8156766fe3
commit 0785d729d5
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
iface/nips/nips_vm/ChangeLog
View file

@ -1,3 +1,14 @@
2010-11-27 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Fix compilation with Clang.
* state.c: Do not include state_inline.h twice with different
value of STATE_INLINE. It was included once via state.h with
STATE_INLINE = "extern inline", and another time directly with
STATE_INLINE = "extern". Now...
* state.h: ... only include it once here with STATE_INLINE =
"static inline".
2010-01-21 Alexandre Duret-Lutz <adl@lrde.epita.fr> 2010-01-21 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Kill a warning on Ubuntu. Kill a warning on Ubuntu.

6
iface/nips/nips_vm/state.c
View file

@ -17,12 +17,6 @@
#define STATE_OUT_DOTTY_LINE_END "\\l\\" #define STATE_OUT_DOTTY_LINE_END "\\l\\"
// import functions as "extern" for unoptimized compilation
#define STATE_INLINE extern
#include "state_inline.h"
#undef STATE_INLINE
// *** helper functions *** // *** helper functions ***
// allocate memory of size sz in supplied buffer // allocate memory of size sz in supplied buffer

2
iface/nips/nips_vm/state.h
View file

@ -121,7 +121,7 @@ typedef struct t_global_state_header
typedef st_global_state_header nipsvm_state_t; typedef st_global_state_header nipsvm_state_t;
// inline functions as "extern inline" for optimized compilation // inline functions as "extern inline" for optimized compilation
#define STATE_INLINE extern inline #define STATE_INLINE static inline
#include "state_inline.h" #include "state_inline.h"
#undef STATE_INLINE #undef STATE_INLINE