Fixed issues with linking params i_implement, i_extern.

3 files changed, 33 insertions, 3 deletions

diff --git a/src/cregex.c b/src/cregex.c
index 730d35a4..62a64b11 100644
--- a/src/cregex.c
+++ b/src/cregex.c
@@ -25,9 +25,24 @@ THE SOFTWARE.
 */
 #ifndef CREGEX_C_INCLUDED
 #define CREGEX_C_INCLUDED
-#include <stc/cstr.h>
-#include <stc/cregex.h> // header only
+
 #include <setjmp.h>
+#ifdef i_extern
+#  define _i_extern
+#endif
+#ifndef CREGEX_H_INCLUDED
+#  include "../include/stc/cregex.h"
+#endif
+#ifdef _i_extern
+#  include "utf8code.c"
+#endif
+#ifdef _i_extern
+#  define i_implement
+#else
+#  undef i_implement
+#endif
+#undef _i_extern
+#include "../include/stc/cstr.h"
 
 typedef uint32_t _Rune; /* Utf8 code point */
 typedef int32_t _Token;
diff --git a/src/libstc.c b/src/libstc.c
index bc61e37c..99611e05 100644
--- a/src/libstc.c
+++ b/src/libstc.c
@@ -1,4 +1,16 @@
+#include <stddef.h>

+#if 1

+#define i_extern

+#include "../include/stc/utf8.h"

+#define i_implement

+#include "../include/stc/cstr.h"

+#define i_implement

+#include "../include/stc/cregex.h"

+#define i_implement

+#include "../include/stc/csview.h"

+#else

 #define i_extern

 #include "../include/stc/cregex.h"

 #define i_implement

 #include "../include/stc/csview.h"

+#endif

diff --git a/src/utf8code.c b/src/utf8code.c
index 496f5eef..6a133050 100644
--- a/src/utf8code.c
+++ b/src/utf8code.c
@@ -1,6 +1,9 @@
 #ifndef UTF8_C_INCLUDED
 #define UTF8_C_INCLUDED
-#include <stc/utf8.h> // header only
+
+#ifndef UTF8_H_INCLUDED
+#include "../include/stc/utf8.h" /* header only */
+#endif
 #include "utf8tabs.inc"
 
 const uint8_t utf8_dtab[] = {