diff options
| author | Araq <rumpf_a@web.de> | 2016-03-29 15:30:44 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2016-03-29 15:31:10 +0200 |
| commit | db2b2156581ffaaa63e7ff9c0a07ced540006956 (patch) | |
| tree | 341535aa355ef422ee886f7b14fda6fbfeae0523 /lib/nimbase.h | |
| parent | 8bf14b12a963980e71ad46e16a8a2e35c9465b8c (diff) | |
| parent | b4f1eef3a3b0ff56d0a68c15c43ffecb7778e939 (diff) | |
| download | Nim-db2b2156581ffaaa63e7ff9c0a07ced540006956.tar.gz | |
resolved merge conflicts
Diffstat (limited to 'lib/nimbase.h')
| -rw-r--r-- | lib/nimbase.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/nimbase.h b/lib/nimbase.h index 266b84b09..5a4f403b6 100644 --- a/lib/nimbase.h +++ b/lib/nimbase.h @@ -108,6 +108,8 @@ __clang__ defined __SUNPRO_C || \ defined __xlC__ # define NIM_THREADVAR __thread +#elif defined __TINYC__ +# define NIM_THREADVAR #else # error "Cannot define NIM_THREADVAR" #endif |