diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2021-06-02 19:18:10 +0200 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2021-06-02 19:18:10 +0200 |
| commit | ffbc962c0a241f7d70b48162f92f2023fe6c043f (patch) | |
| tree | d97dd89b680162b935cb8aae223405ffd0d9e16a /src | |
| parent | 3939a60c73694d5b76d60f61354e0aeb60b270c6 (diff) | |
| download | sciteco-ffbc962c0a241f7d70b48162f92f2023fe6c043f.tar.gz | |
renamed scintilla.[ch] to symbols.[ch]: fixes builds on case-insensitive file systems
* There is a "Scintilla.h" as well.
* should fix macOS and builds on native Windows hosts
* It wasn't practical to refer to the Scintilla includes using paths since
the Scintilla location is configurable (--with-scintilla).
So we'd have to write something like #include <include/Scintilla.h>.
For Scinterm we cannot avoid collisions neither as its path is also
configurable (--with-scinterm).
Effectively, we must prevent name clashes across SciTECO and all
of Scintilla and Scinterm.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/cmdline.c | 2 | ||||
| -rw-r--r-- | src/core-commands.c | 2 | ||||
| -rwxr-xr-x | src/symbols-extract.tes | 2 | ||||
| -rw-r--r-- | src/symbols.c (renamed from src/scintilla.c) | 2 | ||||
| -rw-r--r-- | src/symbols.h (renamed from src/scintilla.h) | 0 |
6 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index a2990d8..17de739 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -54,7 +54,7 @@ libsciteco_base_la_SOURCES = main.c sciteco.h list.h \ goto-commands.c goto-commands.h \ help.c help.h \ rb3str.c rb3str.h \ - scintilla.c scintilla.h \ + symbols.c symbols.h \ view.c view.h \ interface.c interface.h # NOTE: We cannot link in Scintilla (static library) into diff --git a/src/cmdline.c b/src/cmdline.c index 85cbbdd..9e73e4e 100644 --- a/src/cmdline.c +++ b/src/cmdline.c @@ -47,7 +47,7 @@ #include "goto.h" #include "help.h" #include "undo.h" -#include "scintilla.h" +#include "symbols.h" #include "spawn.h" #include "eol.h" #include "error.h" diff --git a/src/core-commands.c b/src/core-commands.c index 4c5d176..0db0328 100644 --- a/src/core-commands.c +++ b/src/core-commands.c @@ -31,7 +31,7 @@ #include "expressions.h" #include "ring.h" #include "parser.h" -#include "scintilla.h" +#include "symbols.h" #include "search.h" #include "spawn.h" #include "glob.h" diff --git a/src/symbols-extract.tes b/src/symbols-extract.tes index 3f71629..356bdd1 100755 --- a/src/symbols-extract.tes +++ b/src/symbols-extract.tes @@ -33,7 +33,7 @@ I/* #include "Q#in" #include "sciteco.h" -#include "scintilla.h" +#include "symbols.h" static const teco_symbol_entry_t entries[] = {^J < diff --git a/src/scintilla.c b/src/symbols.c index f58b6f4..003d745 100644 --- a/src/scintilla.c +++ b/src/symbols.c @@ -32,7 +32,7 @@ #include "undo.h" #include "expressions.h" #include "interface.h" -#include "scintilla.h" +#include "symbols.h" teco_symbol_list_t teco_symbol_list_scintilla = {NULL, 0}; teco_symbol_list_t teco_symbol_list_scilexer = {NULL, 0}; diff --git a/src/scintilla.h b/src/symbols.h index 607a3ff..607a3ff 100644 --- a/src/scintilla.h +++ b/src/symbols.h |