From fe8d8d6af0bd88680ad91475fd19cf00847775fc Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Sat, 25 Nov 2023 13:29:23 +0100 Subject: [PATCH] [cache] Renamed cache.cpp -> cache.c --- src/cache/Makefile | 2 +- src/cache/{cache.cpp => cache.c} | 0 src/cache/meson.build | 2 +- src/scripting/smjs/session_object.cpp | 1 + src/scripting/smjs/smjs.h | 8 ++++++++ src/scripting/smjs/terminal_object.cpp | 1 + src/scripting/smjs/view_state_object.cpp | 5 +++-- 7 files changed, 15 insertions(+), 4 deletions(-) rename src/cache/{cache.cpp => cache.c} (100%) diff --git a/src/cache/Makefile b/src/cache/Makefile index 10e11b29..bd813e19 100644 --- a/src/cache/Makefile +++ b/src/cache/Makefile @@ -1,6 +1,6 @@ top_builddir=../.. include $(top_builddir)/Makefile.config -OBJS = cache.obj dialogs.o +OBJS = cache.o dialogs.o include $(top_srcdir)/Makefile.lib diff --git a/src/cache/cache.cpp b/src/cache/cache.c similarity index 100% rename from src/cache/cache.cpp rename to src/cache/cache.c diff --git a/src/cache/meson.build b/src/cache/meson.build index 16268ae3..4da62631 100644 --- a/src/cache/meson.build +++ b/src/cache/meson.build @@ -1 +1 @@ -srcs += files('cache.cpp', 'dialogs.c') +srcs += files('cache.c', 'dialogs.c') diff --git a/src/scripting/smjs/session_object.cpp b/src/scripting/smjs/session_object.cpp index 988092e3..c0eee898 100644 --- a/src/scripting/smjs/session_object.cpp +++ b/src/scripting/smjs/session_object.cpp @@ -17,6 +17,7 @@ #include "scripting/smjs/elinks_object.h" #include "scripting/smjs/global_object.h" #include "scripting/smjs/session_object.h" +#include "scripting/smjs/smjs.h" #include "scripting/smjs/view_state_object.h" #include "session/history.h" #include "session/location.h" diff --git a/src/scripting/smjs/smjs.h b/src/scripting/smjs/smjs.h index c7c5961a..00b1c674 100644 --- a/src/scripting/smjs/smjs.h +++ b/src/scripting/smjs/smjs.h @@ -1,6 +1,10 @@ #ifndef EL__SCRIPTING_SMJS_SMJS_H #define EL__SCRIPTING_SMJS_SMJS_H +#ifdef __cplusplus +extern "C" { +#endif + struct module; struct cache_entry; struct session; @@ -21,4 +25,8 @@ void smjs_detach_terminal_object(struct terminal *term); void smjs_detach_view_state_object(struct view_state *vs); +#ifdef __cplusplus +} +#endif + #endif diff --git a/src/scripting/smjs/terminal_object.cpp b/src/scripting/smjs/terminal_object.cpp index 0739c7ce..fb48b179 100644 --- a/src/scripting/smjs/terminal_object.cpp +++ b/src/scripting/smjs/terminal_object.cpp @@ -12,6 +12,7 @@ #include "scripting/smjs/core.h" #include "scripting/smjs/elinks_object.h" #include "scripting/smjs/session_object.h" +#include "scripting/smjs/smjs.h" #include "terminal/terminal.h" #include "util/error.h" #include "util/memory.h" diff --git a/src/scripting/smjs/view_state_object.cpp b/src/scripting/smjs/view_state_object.cpp index 8d396151..7a3de856 100644 --- a/src/scripting/smjs/view_state_object.cpp +++ b/src/scripting/smjs/view_state_object.cpp @@ -10,9 +10,10 @@ #include "ecmascript/spidermonkey-shared.h" #include "protocol/uri.h" -#include "scripting/smjs/elinks_object.h" -#include "scripting/smjs/view_state_object.h" #include "scripting/smjs/core.h" +#include "scripting/smjs/elinks_object.h" +#include "scripting/smjs/smjs.h" +#include "scripting/smjs/view_state_object.h" #include "session/history.h" #include "session/location.h" #include "session/session.h"