aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

[tests] compilation fix

Browse Source
This commit is contained in:
Witold Filipczyk 2022-10-13 15:53:54 +02:00
parent 40884da51f
commit 3276cb75a1
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meson.build
View File

@ -1,4 +1,4 @@
project('elinks', ['c','cpp'], version:'0.16.GIT', license:'GPLv2') project('elinks', ['c','cpp'], version:'0.16.GIT', license:'GPLv2', default_options:['cpp_std=gnu++17'])
srcs=[] srcs=[]
srcdir = meson.source_root() srcdir = meson.source_root()
@ -154,7 +154,7 @@ extracflags = []
extracppflags = [] extracppflags = []
if conf_data.get('CONFIG_ECMASCRIPT') if conf_data.get('CONFIG_ECMASCRIPT')
extracppflags += ['-fpermissive', '-Wno-sign-compare', '-std=gnu++17'] extracppflags += ['-fpermissive', '-Wno-sign-compare']
else else
extracflags += ['-Wc++-compat'] extracflags += ['-Wc++-compat']
endif endif
@ -384,6 +384,7 @@ if conf_data.get('CONFIG_BZIP2')
deps += bz2deps deps += bz2deps
endif endif
mozjsdeps = []
if conf_data.get('CONFIG_ECMASCRIPT_SMJS') or conf_data.get('CONFIG_SCRIPTING_SPIDERMONKEY') if conf_data.get('CONFIG_ECMASCRIPT_SMJS') or conf_data.get('CONFIG_SCRIPTING_SPIDERMONKEY')
mozjsdeps = dependency('mozjs-102', static: st) mozjsdeps = dependency('mozjs-102', static: st)
deps += mozjsdeps deps += mozjsdeps

1
src/ecmascript/ecmascript.cpp
View File

@ -526,7 +526,6 @@ ecmascript_protocol_handler(struct session *ses, struct uri *uri)
done_uri(redirect_uri); done_uri(redirect_uri);
} }
void void
ecmascript_timeout_dialog(struct terminal *term, int max_exec_time) ecmascript_timeout_dialog(struct terminal *term, int max_exec_time)
{ {

8
src/ecmascript/ecmascript.h
View File

@ -33,6 +33,10 @@
#include <stdio.h> #include <stdio.h>
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
struct document_view; struct document_view;
struct form_state; struct form_state;
struct form_view; struct form_view;
@ -194,6 +198,10 @@ extern int local_storage_ready;
extern struct module ecmascript_module; extern struct module ecmascript_module;
#ifdef __cplusplus
}
#endif
#endif #endif
#endif #endif

2
src/protocol/test/meson.build
View File

@ -31,7 +31,7 @@ meson.source_root()+'/src/util/env.c')
endif endif
exe = executable('uri-test', uri_test_files, exe = executable('uri-test', uri_test_files,
testdeps, dependencies: [idna_dep], testdeps, dependencies: [idna_dep, mozjsdeps],
c_args:['-DHAVE_CONFIG_H'], cpp_args:['-DHAVE_CONFIG_H'], include_directories:['.', '..', '../..', '../../..', '../../../..']) c_args:['-DHAVE_CONFIG_H'], cpp_args:['-DHAVE_CONFIG_H'], include_directories:['.', '..', '../..', '../../..', '../../../..'])
t = find_program('test-normalize-uri') t = find_program('test-normalize-uri')
test_lib = environment({'TEST_LIB':meson.source_root()+'/test/libtest.sh'}) test_lib = environment({'TEST_LIB':meson.source_root()+'/test/libtest.sh'})