I hate gnulib's habit of redefining things

.github/workflows/codeql.yml

@@ -83,7 +83,7 @@ jobs:
         sh ./autogen.sh
         ./configure --without-gif --enable-silent-rules --disable-autodepend --enable-gcc-warnings
         make gnulib_headers || (stat lib/Makefile && wc -l lib/Makefile)
-        if test -x "$(which gmake)" && test -x "$(which nproc)" && test -n "$(nproc)"; then \
+        if test -x "$(which gmake)" && test -x "$(which nproc)" && test -n "$(nproc)" && test "$(nproc)" -lt 4; then \
           echo "attempting parallel build with $(nproc) jobs..."; \
           gmake -j"$(nproc)" --output-sync --no-print-directory only_temacs; \
           gmake -j"$(nproc)" --output-sync --no-print-directory all_only_c; \

.github/workflows/emacs-apple.yml

@@ -34,7 +34,7 @@ jobs:
           ./configure --enable-silent-rules --disable-autodepend --enable-gcc-warnings --enable-better-debugging --with-x-toolkit=no --disable-dependency-tracking --with-ns; \
         fi
         make gnulib_headers || (stat lib/Makefile && wc -l lib/Makefile)
-        if test -x "$(which gmake)" && test -x "$(which nproc)" && test -n "$(nproc)" && test "$(nproc)" -lt 4; then \
+        if test -x "$(which gmake)" && test -x "$(which nproc)" && test -n "$(nproc)"; then \
           echo "attempting parallel build with $(nproc) jobs..."; \
           gmake -j"$(nproc)" --output-sync only_temacs; \
         else \

src/xterm.c

@@ -3808,6 +3808,11 @@ x_get_keysym_name (int keysym)
    tracking is on, and I suspect only negligibly worse when tracking
    is off.  */
 
+/* in case gnulib redefined this on us: */
+#ifdef time
+# undef time
+#endif /* time */
+
 /* Prepare a mouse-event in *RESULT for placement in the input queue.
 
    If the event is a button press, then note that we have grabbed