mirrors
/
janet
mirror of https://github.com/janet-lang/janet
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

Fix build error for 1.15.2

This commit is contained in:
Calvin Rose 2021-02-15 10:27:19 -06:00
parent dd14b24d2a
commit f1819c916a
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -1,7 +1,7 @@
# Changelog # Changelog
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
## 1.15.1 - 2021-02-15 ## 1.15.2 - 2021-02-15
- Fix bug in windows version of `os/spawn` and `os/execute` with setting environment variables. - Fix bug in windows version of `os/spawn` and `os/execute` with setting environment variables.
- Fix documentation typos. - Fix documentation typos.
- Fix peg integer reading combinators when used with capture tags. - Fix peg integer reading combinators when used with capture tags.

2
meson.build
View File

@ -20,7 +20,7 @@
project('janet', 'c', project('janet', 'c',
default_options : ['c_std=c99', 'b_lundef=false', 'default_library=both'], default_options : ['c_std=c99', 'b_lundef=false', 'default_library=both'],
version : '1.15.1') version : '1.15.2')
# Global settings # Global settings
janet_path = join_paths(get_option('prefix'), get_option('libdir'), 'janet') janet_path = join_paths(get_option('prefix'), get_option('libdir'), 'janet')

4
src/conf/janetconf.h
View File

@ -5,9 +5,9 @@
#define JANET_VERSION_MAJOR 1 #define JANET_VERSION_MAJOR 1
#define JANET_VERSION_MINOR 15 #define JANET_VERSION_MINOR 15
#define JANET_VERSION_PATCH 1 #define JANET_VERSION_PATCH 2
#define JANET_VERSION_EXTRA "" #define JANET_VERSION_EXTRA ""
#define JANET_VERSION "1.15.1" #define JANET_VERSION "1.15.2"
/* #define JANET_BUILD "local" */ /* #define JANET_BUILD "local" */

4
src/core/os.c
View File

@ -249,13 +249,13 @@ static EnvBlock os_execute_env(int32_t argc, const Janet *argv) {
static void os_execute_cleanup(EnvBlock envp, const char **child_argv) { static void os_execute_cleanup(EnvBlock envp, const char **child_argv) {
#ifdef JANET_WINDOWS #ifdef JANET_WINDOWS
(void) child_argv; (void) child_argv;
janet_sfree(envp); if (NULL != envp) janet_sfree(envp);
#else #else
janet_sfree((void *)child_argv); janet_sfree((void *)child_argv);
if (NULL != envp) { if (NULL != envp) {
char **envitem = envp; char **envitem = envp;
while (*envitem != NULL) { while (*envitem != NULL) {
free(*envitem); janet_sfree(*envitem);
envitem++; envitem++;
} }
} }