diff options
| author | Tyge Løvset <[email protected]> | 2023-02-05 21:21:55 +0100 |
|---|---|---|
| committer | Tyge Løvset <[email protected]> | 2023-02-05 21:21:55 +0100 |
| commit | e6dfaf1720f6833784d17d5364e1dd76324dff6a (patch) | |
| tree | 0808f479425e58971aef993288bb818e60417422 /include/stc | |
| parent | 217865ae413f9cfcc72af176ec7e98f418bddbea (diff) | |
| download | STC-modified-e6dfaf1720f6833784d17d5364e1dd76324dff6a.tar.gz STC-modified-e6dfaf1720f6833784d17d5364e1dd76324dff6a.zip | |
Some last minute changes: reverted mostly the c_extern from last commit.
Renamed c_ARGSV(sv) macro to c_SVARG(sv). Both available.
Diffstat (limited to 'include/stc')
| -rw-r--r-- | include/stc/ccommon.h | 2 | ||||
| -rw-r--r-- | include/stc/crandom.h | 2 | ||||
| -rw-r--r-- | include/stc/cspan.h | 2 | ||||
| -rw-r--r-- | include/stc/csview.h | 2 | ||||
| -rw-r--r-- | include/stc/priv/altnames.h | 1 |
5 files changed, 5 insertions, 4 deletions
diff --git a/include/stc/ccommon.h b/include/stc/ccommon.h index b8ea6316..d5daf252 100644 --- a/include/stc/ccommon.h +++ b/include/stc/ccommon.h @@ -133,7 +133,7 @@ typedef const char* crawstr; #define c_SV(...) c_MACRO_OVERLOAD(c_SV, __VA_ARGS__) #define c_SV_1(lit) c_SV_2(lit, crawstr_len(lit)) #define c_SV_2(str, n) (c_LITERAL(csview){str, n}) -#define c_ARGSV(sv) (int)(sv).size, (sv).str /* use with "%.*s" */ +#define c_SVARG(sv) (int)(sv).size, (sv).str /* use with "%.*s" */ #define c_PAIR(ref) (ref)->first, (ref)->second #define _c_ROTL(x, k) (x << (k) | x >> (8*sizeof(x) - (k))) diff --git a/include/stc/crandom.h b/include/stc/crandom.h index 827c93d6..a9374602 100644 --- a/include/stc/crandom.h +++ b/include/stc/crandom.h @@ -109,7 +109,7 @@ STC_INLINE stc64_normalf_t stc64_normalf_new(double mean, double stddev) { } /* -------------------------- IMPLEMENTATION ------------------------- */ -#if defined(i_static) || defined(i_extern) +#if defined(i_implement) /* Global random() */ static stc64_t stc64_global = {{ diff --git a/include/stc/cspan.h b/include/stc/cspan.h index f8ae9315..cc3d03b3 100644 --- a/include/stc/cspan.h +++ b/include/stc/cspan.h @@ -207,7 +207,7 @@ STC_API intptr_t _cspan_slice(int32_t odim[], int32_t ostri[], int* orank, int rank, const int32_t a[][2]); /* -------------------------- IMPLEMENTATION ------------------------- */ -#if defined(i_static) || defined(i_extern) +#if defined(i_implement) STC_DEF intptr_t _cspan_idxN(int rank, const int32_t shape[], const int32_t stri[], const int32_t a[]) { intptr_t off = a[0]; diff --git a/include/stc/csview.h b/include/stc/csview.h index aa519fec..a30672cd 100644 --- a/include/stc/csview.h +++ b/include/stc/csview.h @@ -159,7 +159,7 @@ STC_INLINE bool csview_eq(const csview* x, const csview* y) STC_API uint64_t csview_hash(const csview *self); /* -------------------------- IMPLEMENTATION ------------------------- */ -#if defined(i_static) || defined(i_extern) +#if defined(i_implement) STC_DEF intptr_t csview_find_sv(csview sv, csview search) { char* res = cstrnstrn(sv.str, search.str, sv.size, search.size); diff --git a/include/stc/priv/altnames.h b/include/stc/priv/altnames.h index 024868c2..0c6db0b2 100644 --- a/include/stc/priv/altnames.h +++ b/include/stc/priv/altnames.h @@ -38,3 +38,4 @@ #define c_scope c_SCOPE #define c_defer c_DEFER #define c_sv c_SV +#define c_ARGSV c_SVARG |