From d3c0867a5a1079e43be358dc75b6da9df2291f4a Mon Sep 17 00:00:00 2001 From: crc Date: Wed, 1 May 2019 11:59:13 +0000 Subject: [PATCH] fix clock:year FossilOrigin-Name: f7be17407c77e34eba0af403e17ebe32d1387a5581989399bebd491241caf5a0 --- RELEASE_NOTES.md | 31 ++++--------------------------- RETRO-Book.md | 20 +++++++++----------- doc/book/Building-Linux | 13 ++----------- interfaces/io/unix.c | 2 +- 4 files changed, 16 insertions(+), 50 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 1c1b0ca..b53f5ba 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -4,37 +4,14 @@ This is the changelog for the development builds of Retro. ## Bug Fixes +- (all) strl* functions now only compiled if using GLIBC. +- (rre) `clock:year` corrected + ## Build -- Makefile.linux is now GNUmakefile - -## Core Language - -## I/O and Extensions - -### Floating Point - -### Unix - -## Nga - -## Interfaces - -### retro - -### retro-compiler - -### native - -## Tools - -## Other +- Merged Linux & BSD Makefiles ## Documentation - updated Linux build instructions - updated Starting instructions - -## Examples - -## Final Notes diff --git a/RETRO-Book.md b/RETRO-Book.md index 8512cd5..2b74411 100644 --- a/RETRO-Book.md +++ b/RETRO-Book.md @@ -134,17 +134,8 @@ In the `bin/` directory: I've had issues building on Linux in the past. The GNU toolchain can be quite problematic. -If the build fails, try: - - make -f GNUmakefile - -or: - - mv GNUmakefile Makefile - make - -If none of these work, contact Charles with details and he will -work on finding a fix. +If the build fails please contact Charles with details and he +will work on finding a fix. # Building RETRO on macOS @@ -581,6 +572,13 @@ This illustrates the format. Only code in the fenced blocks (Note: this only applies to *source files*; fences are not used when entering code interactively). +## On The Name + +The name Unu comes from the Maori language, where it means: + + (verb) (-hia) pull out, withdraw, draw out, extract. + Taken from https://maoridictionary.co.nz/ + # Naming Conventions Word names in RETRO generally follow the following conventions. diff --git a/doc/book/Building-Linux b/doc/book/Building-Linux index 347f4f4..33ac327 100644 --- a/doc/book/Building-Linux +++ b/doc/book/Building-Linux @@ -36,14 +36,5 @@ In the `bin/` directory: I've had issues building on Linux in the past. The GNU toolchain can be quite problematic. -If the build fails, try: - - make -f GNUmakefile - -or: - - mv GNUmakefile Makefile - make - -If none of these work, contact Charles with details and he will -work on finding a fix. +If the build fails please contact Charles with details and he +will work on finding a fix. diff --git a/interfaces/io/unix.c b/interfaces/io/unix.c index b7f91e3..490dc29 100644 --- a/interfaces/io/unix.c +++ b/interfaces/io/unix.c @@ -296,7 +296,7 @@ void unix_time_month() { void unix_time_year() { time_t t = time(NULL); - stack_push((CELL)localtime(&t)->tm_year + 1990); + stack_push((CELL)localtime(&t)->tm_year + 1900); } void unix_time_hour() {