Skip to content

Commit 2a167aa

Browse files
committed
Merge remote-tracking branch 'origin/master' into bbatkin/hot-path-lint-and-env-docs
2 parents 21a1ea3 + 914009c commit 2a167aa

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

modules/dasTreeSitter/languages/cpp/scanner.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ static bool scan_raw_string_content(Scanner *scanner, TSLexer *lexer) {
9494
}
9595
}
9696

97-
void *tree_sitter_cpp_external_scanner_create() {
97+
void *tree_sitter_cpp_external_scanner_create(void) {
9898
Scanner *scanner = (Scanner *)ts_calloc(1, sizeof(Scanner));
9999
memset(scanner, 0, sizeof(Scanner));
100100
return scanner;

modules/dasTreeSitter/languages/markdown_inline/scanner.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ static bool scan(Scanner *s, TSLexer *lexer, const bool *valid_symbols) {
366366
return false;
367367
}
368368

369-
void *tree_sitter_markdown_inline_external_scanner_create() {
369+
void *tree_sitter_markdown_inline_external_scanner_create(void) {
370370
Scanner *s = (Scanner *)malloc(sizeof(Scanner));
371371
deserialize(s, NULL, 0);
372372
return s;

src/builtin/module_builtin_fio.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1663,7 +1663,7 @@ namespace das {
16631663
void set_env_variable ( const char * var, const char * value, Context *, LineInfoArg * ) {
16641664
// process-wide; children spawned via popen/popen_argv inherit it
16651665
if ( !var || !*var ) return;
1666-
#ifdef _MSC_VER
1666+
#ifdef _WIN32
16671667
_putenv_s(var, value ? value : "");
16681668
#else
16691669
setenv(var, value ? value : "", 1);

0 commit comments

Comments
 (0)