This patch provides an update so that nhc98 can be built and works with
a modern C compiler (GCC 11) and libc (glibc 2.33).

diff --git a/Makefile.inc b/Makefile.inc
index 4fbd47a..5bce5c9 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,6 +1,10 @@
 ### Configurable variables:
 
-OPT = -O3
+# We want C89 semantics plus C++-style comments and things like the
+# 'setjmp_buf' and 'u_short' types.  More importantly, build with '-O1'
+# only to avoid modern optimizations that break the code.
+OPT = -O1 -std=gnu89 -D_GNU_SOURCE=1
+
 #ARCH = -m32
 ARCH = 
 
diff --git a/script/nhc98heap.c b/script/nhc98heap.c
index 534010e..a30d5cd 100644
--- a/script/nhc98heap.c
+++ b/script/nhc98heap.c
@@ -1,5 +1,6 @@
 #include <stdlib.h>
 #include <stdio.h>
+#include <ctype.h>
 main(int argc, char **argv)
 {
   int prefix = 1;
diff --git a/src/runtime/Kernel/collector.c b/src/runtime/Kernel/collector.c
index b95a273..1f879c5 100644
--- a/src/runtime/Kernel/collector.c
+++ b/src/runtime/Kernel/collector.c
@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 #include "node.h"
 /*#include "newmacros.h"  -- already included in node.h */
 /*#include "runtime.h"    -- already included in node.h */
'/guix/tree/gnu/packages/gl.scm?id=c8b19d97833243e7e89f8ca83a0d641de6516271'>tree</a><a href='/guix/commit/gnu/packages/gl.scm?id=c8b19d97833243e7e89f8ca83a0d641de6516271'>commit</a><a href='/guix/diff/gnu/packages/gl.scm?id=c8b19d97833243e7e89f8ca83a0d641de6516271'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/gl.scm'>
<input type='hidden' name='id' value='c8b19d97833243e7e89f8ca83a0d641de6516271'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=c8b19d97833243e7e89f8ca83a0d641de6516271'>root</a>/<a href='/guix/log/gnu?id=c8b19d97833243e7e89f8ca83a0d641de6516271'>gnu</a>/<a href='/guix/log/gnu/packages?id=c8b19d97833243e7e89f8ca83a0d641de6516271'>packages</a>/<a href='/guix/log/gnu/packages/gl.scm?id=c8b19d97833243e7e89f8ca83a0d641de6516271'>gl.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/gl.scm?id=c8b19d97833243e7e89f8ca83a0d641de6516271&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
class='left'>Author</th></tr>
<tr><td><span title='2016-10-28 22:30:17 +0200'>2016-10-28</span></td><td><a href='/guix/commit/nix/libstore/sqlite.cc?id=b1fd0ab73425e682a0a1404da6963f47a033bb34'>daemon: Improve the SQLite wrapper API.</a><span class='msg-avail'>...<span class='msg-tooltip'>In particular, this eliminates a bunch of boilerplate code.

Also integrates these Nix commits:

  80da7a6 Probably fix SQLITE_BUSY errors
  37a337b throwSQLiteError(): Check for SIGINT so we don't loop forever

Co-authored-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Eelco Dolstra</td></tr>
<tr><td><span title='2016-10-28 22:30:17 +0200'>2016-10-28</span></td><td><a href='/guix/commit/nix/libstore/sqlite.cc?id=7bed5d91dea6ecff565d51a021e6f99718d04f86'>daemon: Factor out SQLite handling.</a><span class='msg-avail'>...<span class='msg-tooltip'>* nix/libstore/local-store.cc: Move SQLite code to...
* nix/libstore/sqlite.cc, nix/libstore/sqlite.hh: ... here.  New files.
* nix/local.mk (libstore_a_SOURCES): Add sqlite.cc.
(libstore_headers): Add sqlite.hh.

Co-authored-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Eelco Dolstra</td></tr>