Rename i_extern template flag to i_import. i_extern still available, but deprecated.

8 files changed, 18 insertions, 19 deletions

diff --git a/include/stc/ccommon.h b/include/stc/ccommon.h
index 87522a6e..e491a567 100644
--- a/include/stc/ccommon.h
+++ b/include/stc/ccommon.h
@@ -241,6 +241,9 @@ STC_INLINE intptr_t cnextpow2(intptr_t n) {
 #undef STC_API
 #undef STC_DEF
 
+#ifdef i_extern
+#  define i_import
+#endif
 #if !defined(i_static) && !defined(STC_STATIC) && (defined(i_header) || defined(STC_HEADER) || \
                                                    defined(i_implement) || defined(STC_IMPLEMENT))
   #define STC_API extern
@@ -250,9 +253,6 @@ STC_INLINE intptr_t cnextpow2(intptr_t n) {
   #define STC_API static inline
   #define STC_DEF static inline
 #endif
-#if defined(STC_EXTERN)
-  #define i_extern
-#endif
-#if defined(STC_IMPLEMENT) || defined(i_extern)
+#if defined(STC_IMPLEMENT) || defined(i_import)
   #define i_implement
 #endif
diff --git a/include/stc/crand.h b/include/stc/crand.h
index b9687c01..95a65fb0 100644
--- a/include/stc/crand.h
+++ b/include/stc/crand.h
@@ -158,4 +158,4 @@ STC_DEF double crand_norm(crand_t* rng, crand_norm_t* dist) {
 #undef i_static
 #undef i_header
 #undef i_implement
-#undef i_extern
+#undef i_import
diff --git a/include/stc/cregex.h b/include/stc/cregex.h
index e6180a31..43a7fcbf 100644
--- a/include/stc/cregex.h
+++ b/include/stc/cregex.h
@@ -161,12 +161,12 @@ void cregex_drop(cregex* re);
 #if defined i_implement
 #  include "../../src/cregex.c"
 #endif
-#if defined i_extern
+#if defined i_import
 #  include "../../src/utf8code.c"
 #endif
 #endif // CREGEX_H_INCLUDED
 #undef i_opt
 #undef i_header
 #undef i_static
-#undef i_extern
+#undef i_import
 #undef i_implement
diff --git a/include/stc/cspan.h b/include/stc/cspan.h
index 5b592098..dd6cb1c0 100644
--- a/include/stc/cspan.h
+++ b/include/stc/cspan.h
@@ -265,4 +265,4 @@ STC_DEF intptr_t _cspan_slice(int32_t odim[], int32_t ostri[], int* orank,
 #undef i_header
 #undef i_implement
 #undef i_static
-#undef i_extern
+#undef i_import
diff --git a/include/stc/cstr.h b/include/stc/cstr.h
index ae80dab4..f47889b4 100644
--- a/include/stc/cstr.h
+++ b/include/stc/cstr.h
@@ -405,8 +405,8 @@ STC_INLINE bool cstr_getline(cstr *self, FILE *fp)
 
 #endif // CSTR_H_INCLUDED
 
-/* -------------------------- EXTERN ------------------------- */
-#if defined(i_extern) && !defined(CSTR_X_INCLUDED)
+/* -------------------------- UTF8 CASE CONVERSION ------------------------- */
+#if defined(i_import) && !defined(CSTR_X_INCLUDED)
 #define CSTR_X_INCLUDED
 
 static struct {
@@ -437,11 +437,11 @@ cstr cstr_tocase(csview sv, int k) {
     cstr_shrink_to_fit(&out);
     return out;
 }
-#endif // i_extern
+#endif // i_import
 
 /* -------------------------- IMPLEMENTATION ------------------------- */
 #ifndef CSTR_C_INCLUDED
-#if defined i_extern || (defined i_implement && !defined _i_no_undef)
+#if defined i_import || (defined i_implement && !defined _i_no_undef)
 #define CSTR_C_INCLUDED
 
 uint64_t cstr_hash(const cstr *self) {
@@ -659,4 +659,4 @@ intptr_t cstr_printf(cstr* self, const char* fmt, ...) {
 #undef i_header
 #undef i_static
 #undef i_implement
-#undef i_extern
+#undef i_import
diff --git a/include/stc/csview.h b/include/stc/csview.h
index d38d5f59..ee217e98 100644
--- a/include/stc/csview.h
+++ b/include/stc/csview.h
@@ -151,7 +151,7 @@ STC_INLINE bool csview_eq(const csview* x, const csview* y)
 
 /* -------------------------- IMPLEMENTATION ------------------------- */
 #ifndef CSVIEW_C_INCLUDED
-#if defined i_extern || (defined i_implement && !defined _i_no_undef)
+#if defined i_import || (defined i_implement && !defined _i_no_undef)
 #define CSVIEW_C_INCLUDED
 
 csview_iter csview_advance(csview_iter it, intptr_t pos) {
@@ -201,11 +201,10 @@ csview csview_token(csview sv, const char* sep, intptr_t* start) {
     *start += tok.size + sep_size;
     return tok;
 }
-
 #endif
 #endif
 #undef i_opt
 #undef i_header
 #undef i_implement
 #undef i_static
-#undef i_extern
+#undef i_import
diff --git a/include/stc/priv/template2.h b/include/stc/priv/template2.h
index d7588ca0..75402150 100644
--- a/include/stc/priv/template2.h
+++ b/include/stc/priv/template2.h
@@ -59,7 +59,7 @@
 #undef i_header
 #undef i_implement
 #undef i_static
-#undef i_extern
+#undef i_import
 
 #undef i_allocator
 #undef i_malloc
diff --git a/include/stc/utf8.h b/include/stc/utf8.h
index 338f0db9..e853263b 100644
--- a/include/stc/utf8.h
+++ b/include/stc/utf8.h
@@ -115,14 +115,14 @@ STC_INLINE intptr_t utf8_pos(const char* s, intptr_t index)
     { return (intptr_t)(utf8_at(s, index) - s); }
 #endif // UTF8_H_INCLUDED
 
-#if defined i_extern || (defined i_implement && !defined _i_no_undef)
+#if defined i_import || (defined i_implement && !defined _i_no_undef)
 #  include "../../src/utf8code.c"
 #endif
 #ifndef _i_no_undef
 #undef i_static
 #undef i_header
 #undef i_implement
-#undef i_extern
+#undef i_import
 #undef i_opt
 #endif
 #undef _i_no_undef