Merge branch 'master' into nec98

lpproj · Jul 31, 2020 · 1fb73a6 · 1fb73a6
2 parents ff819a6 + bfe1889
commit 1fb73a6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/include/sys/time.h b/include/sys/time.h
@@ -1,3 +1,4 @@
+/* Copyright (C) 2020 DJ Delorie, see COPYING.DJ for details */
 /* Copyright (C) 2012 DJ Delorie, see COPYING.DJ for details */
 /* Copyright (C) 2003 DJ Delorie, see COPYING.DJ for details */
 /* Copyright (C) 1999 DJ Delorie, see COPYING.DJ for details */
@@ -38,7 +39,7 @@ extern long __djgpp_clock_tick_interval;
 
 int getitimer(int _which, struct itimerval *_value);
 int setitimer(int _which, struct itimerval *_value, struct itimerval *_ovalue);
-int utimes(const char *_file, struct timeval _tvp[2]);
+int utimes(const char *_file, const struct timeval _tvp[2]);
 
 #endif /* !_POSIX_SOURCE */
 #endif /* !__STRICT_ANSI__ */

diff --git a/src/docs/kb/wc206.txi b/src/docs/kb/wc206.txi
@@ -22,7 +22,8 @@ Fixed a @code{NULL} pointer dereference in termios @code{vbios_write_ch}
 private procedure.
 
 @cindex dxe3gen and extended coff relocations
-@command{dxe3gen} now handles extended coff relocations (more than 65535 relocs.)
+@command{dxe3gen} now handles extended coff relocations (more than 65535 relocs.
+Requires a DJGPP port of binutils-2.22 or newer.)
 
 @cindex Update of DXE linker script
 The dxe linker script @file{dxe.ld} now handles @code{.gnu.linkonce.b.*}

diff --git a/src/libc/ansi/stdlib/nmalloc.txh b/src/libc/ansi/stdlib/nmalloc.txh
@@ -132,7 +132,7 @@ if (now + new > max)
 
 @example
 #include <stdlib.h>
-#include <malldbg.h> /* on non-DJGPP systems */
+#include <libc/malldbg.h> /* on non-DJGPP systems */
 
 struct mallinfo mallinfo(void);
 @end example
@@ -239,7 +239,7 @@ The @code{mallinfo} structure filled with information.
 
 @example
 #include <stdlib.h>
-#include <malldbg.h> /* on non-DJGPP systems */
+#include <libc/malldbg.h> /* on non-DJGPP systems */
 
 int malloc_verify(void);
 @end example
@@ -283,7 +283,7 @@ tests failed.
 
 @example
 #include <stdlib.h>
-#include <malldbg.h> /* on non-DJGPP systems */
+#include <libc/malldbg.h> /* on non-DJGPP systems */
 
 int malloc_debug(int level);
 @end example
@@ -361,7 +361,7 @@ default level is 0.
 
 @example
 #include <stdlib.h>
-#include <malldbg.h> /* on non-DJGPP systems */
+#include <libc/malldbg.h> /* on non-DJGPP systems */
 
 void mallocmap(void);
 @end example
@@ -412,7 +412,7 @@ Initial value of output file is stderr.
 
 @example
 #include <stdlib.h>
-#include <malldbg.h> /* on non-DJGPP systems */
+#include <libc/malldbg.h> /* on non-DJGPP systems */
 
 M_HOOKFN mallsethook(enum m_hook_kind which,
                      M_HOOKFN newhook);
@@ -559,7 +559,7 @@ These hooks and the function are specific to DJGPP.
 
 @example
 #include <stdlib.h>
-#include <malldbg.h> (on non-DJGPP systems)
+#include <libc/malldbg.h> (on non-DJGPP systems)
 
 FILE *malldbgdmpfile(FILE *fp);
 @end example
@@ -593,8 +593,8 @@ FILE *oldfile = malldbgdmpfile(stdout);
 
 @example
 #include <stdlib.h>
-#include <malldbg.h>  /* on non-DJGPP systems */
-#include <sysquery.h> /* alternative on non-DJGPP systems */
+#include <libc/malldbg.h>  /* on non-DJGPP systems */
+#include <libc/sysquery.h> /* alternative on non-DJGPP systems */
 
 struct _sysquery _sysmalloc(void);
 @end example

diff --git a/src/libc/compat/time/utimes.c b/src/libc/compat/time/utimes.c
@@ -1,9 +1,10 @@
+/* Copyright (C) 2020 DJ Delorie, see COPYING.DJ for details */
 /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
 #include <sys/time.h>
 #include <utime.h>
 
 int
-utimes(const char *file, struct timeval tvp[2])
+utimes(const char *file, const struct timeval tvp[2])
 {
   struct utimbuf utb;
   utb.actime = tvp[0].tv_sec;

diff --git a/src/libc/compat/time/utimes.txh b/src/libc/compat/time/utimes.txh
@@ -5,7 +5,7 @@
 @example
 #include <sys/time.h>
 
-int utimes(const char *file, struct timeval tvp[2]);
+int utimes(const char *file, const struct timeval tvp[2]);
 @end example
 
 @subheading Description