Update.

1997-05-26 22:51  Ulrich Drepper  <drepper@cygnus.com>

	* configure.in: Use AC_PROG_CC_LOCAL instead of AC_PROC_CC.
	* aclocal.m4: Add AC_PROG_CC_LOCAL which does not fail for
	environments in which linking is not possible at configure time
	(since te libc is just build).
	Based on patches by Marcus G. Daniels <marcus@cathcart.sysc.pdx.edu>.

	* time/scheck.c (scheck): Make 2nd parameter const.
	* time/private.h: Likewise.

1997-05-26 18:58  Ulrich Drepper  <drepper@cygnus.com>

	* stdlib/random_r.c (__initstate_r): Initialize randomizer type in
	state array only at right place.
	Reported by Sven Verdoolaege <skimo@breughel.ufsia.ac.be>.

	* stdlib/erand48_r.c (__erand48_r): Don't generate numbers in
	[0.5,1.0) but really in [0.0, 1.0).
	Patch by Oliver Gathmann <gathmann@scar.utoronto.ca>.

1997-05-22 12:50  Eric Delaunay  <delaunay@lix.polytechnique.fr>

	* shlib-versions: Provide Linux/SPARC defaults.

1997-05-26 15:00  Matthias Urlichs  <urlichs@noris.de>

	* stdlib/strtod_l.c: Add missing #include <xlocale.h>.
	* stdlib/strtof_l.c: Likewise.
	* stdlib/strtol_l.c: Likewise.
	* stdlib/strtold_l.c: Likewise.
	* stdlib/strtoll_l.c: Likewise.
	* stdlib/strtoul_l.c: Likewise.
	* stdlib/strtoull_l.c: Likewise.

1997-05-26 02:42  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* hurd/dtable.c: De-ansidecl-fy.
	* math/test-math.c: Likewise.
	* signal/tst-signal.c: Likewise.
	* stdio/getc.c: Likewise.
	* stdio/obstream.c: Likewise.
	* stdio/putc.c: Likewise.
	* stdio-common/bug1.c: Likewise.
	* stdio-common/bug2.c: Likewise.
	* stdio-common/bug6.c: Likewise.
	* stdio-common/fscanf.c: Likewise.
	* stdlib/testsort.c: Likewise.
	* string/tester.c: Likewise.
	* sysdeps/am29k/ffs.c: Likewise.
	* sysdeps/generic/bb_init_func.c: Likewise.
	* sysdeps/generic/bcopy.c: Likewise.
	* sysdeps/generic/bzero.c: Likewise.
	* sysdeps/generic/div.c: Likewise.
	* sysdeps/generic/ffs.c: Likewise.
	* sysdeps/generic/memccpy.c: Likewise.
	* sysdeps/generic/memcpy.c: Likewise.
	* sysdeps/generic/memmove.c: Likewise.
	* sysdeps/generic/memset.c: Likewise.
	* sysdeps/generic/vfork.c: Likewise.
	* sysdeps/generic/vtimes.c: Likewise.
	* sysdeps/i386/bzero.c: Likewise.
	* sysdeps/i386/ffs.c: Likewise.
	* sysdeps/i960/ffs.c: Likewise.
	* sysdeps/m68k/ffs.c: Likewise.
	* sysdeps/m88k/ffs.c: Likewise.
	* sysdeps/mach/hurd/_exit.c: Likewise.
	* sysdeps/mach/hurd/accept.c: Likewise.
	* sysdeps/mach/hurd/access.c: Likewise.
	* sysdeps/mach/hurd/adjtime.c: Likewise.
	* sysdeps/mach/hurd/bind.c: Likewise.
	* sysdeps/mach/hurd/brk.c: Likewise.
	* sysdeps/mach/hurd/chdir.c: Likewise.
	* sysdeps/mach/hurd/chflags.c: Likewise.
	* sysdeps/mach/hurd/chmod.c: Likewise.
	* sysdeps/mach/hurd/chown.c: Likewise.
	* sysdeps/mach/hurd/chroot.c: Likewise.
	* sysdeps/mach/hurd/close.c: Likewise.
	* sysdeps/mach/hurd/connect.c: Likewise.
	* sysdeps/mach/hurd/defs.c: Likewise.
	* sysdeps/mach/hurd/dup2.c: Likewise.
	* sysdeps/mach/hurd/execve.c: Likewise.
	* sysdeps/mach/hurd/fchdir.c: Likewise.
	* sysdeps/mach/hurd/fchflags.c: Likewise.
	* sysdeps/mach/hurd/fchmod.c: Likewise.
	* sysdeps/mach/hurd/fchown.c: Likewise.
	* sysdeps/mach/hurd/fcntl.c: Likewise.
	* sysdeps/mach/hurd/fdopen.c: Likewise.
	* sysdeps/mach/hurd/flock.c: Likewise.
	* sysdeps/mach/hurd/fsync.c: Likewise.
	* sysdeps/mach/hurd/ftruncate.c: Likewise.
	* sysdeps/mach/hurd/getdtsz.c: Likewise.
	* sysdeps/mach/hurd/getegid.c: Likewise.
	* sysdeps/mach/hurd/geteuid.c: Likewise.
	* sysdeps/mach/hurd/getgid.c: Likewise.
	* sysdeps/mach/hurd/getgroups.c: Likewise.
	* sysdeps/mach/hurd/gethostid.c: Likewise.
	* sysdeps/mach/hurd/gethostname.c: Likewise.
	* sysdeps/mach/hurd/getitimer.c: Likewise.
	* sysdeps/mach/hurd/getlogin.c: Likewise.
	* sysdeps/mach/hurd/getpeername.c: Likewise.
	* sysdeps/mach/hurd/getpgid.c: Likewise.
	* sysdeps/mach/hurd/getpid.c: Likewise.
	* sysdeps/mach/hurd/getppid.c: Likewise.
	* sysdeps/mach/hurd/getsockname.c: Likewise.
	* sysdeps/mach/hurd/getsockopt.c: Likewise.
	* sysdeps/mach/hurd/getuid.c: Likewise.
	* sysdeps/mach/hurd/ioctl.c: Likewise.
	* sysdeps/mach/hurd/isatty.c: Likewise.
	* sysdeps/mach/hurd/link.c: Likewise.
	* sysdeps/mach/hurd/listen.c: Likewise.
	* sysdeps/mach/hurd/lseek.c: Likewise.
	* sysdeps/mach/hurd/mkdir.c: Likewise.
	* sysdeps/mach/hurd/open.c: Likewise.
	* sysdeps/mach/hurd/pipe.c: Likewise.
	* sysdeps/mach/hurd/read.c: Likewise.
	* sysdeps/mach/hurd/readlink.c: Likewise.
	* sysdeps/mach/hurd/reboot.c: Likewise.
	* sysdeps/mach/hurd/recv.c: Likewise.
	* sysdeps/mach/hurd/recvfrom.c: Likewise.
	* sysdeps/mach/hurd/rename.c: Likewise.
	* sysdeps/mach/hurd/rewinddir.c: Likewise.
	* sysdeps/mach/hurd/rmdir.c: Likewise.
	* sysdeps/mach/hurd/sbrk.c: Likewise.
	* sysdeps/mach/hurd/seekdir.c: Likewise.
	* sysdeps/mach/hurd/select.c: Likewise.
	* sysdeps/mach/hurd/setegid.c: Likewise.
	* sysdeps/mach/hurd/seteuid.c: Likewise.
	* sysdeps/mach/hurd/setgid.c: Likewise.
	* sysdeps/mach/hurd/setgroups.c: Likewise.
	* sysdeps/mach/hurd/sethostid.c: Likewise.
	* sysdeps/mach/hurd/sethostname.c: Likewise.
	* sysdeps/mach/hurd/setlogin.c: Likewise.
	* sysdeps/mach/hurd/setpgid.c: Likewise.
	* sysdeps/mach/hurd/setregid.c: Likewise.
	* sysdeps/mach/hurd/setreuid.c: Likewise.
	* sysdeps/mach/hurd/setrlimit.c: Likewise.
	* sysdeps/mach/hurd/setsid.c: Likewise.
	* sysdeps/mach/hurd/setsockopt.c: Likewise.
	* sysdeps/mach/hurd/settimeofday.c: Likewise.
	* sysdeps/mach/hurd/setuid.c: Likewise.
	* sysdeps/mach/hurd/shutdown.c: Likewise.
	* sysdeps/mach/hurd/sigaction.c: Likewise.
	* sysdeps/mach/hurd/sigaltstack.c: Likewise.
	* sysdeps/mach/hurd/sigpending.c: Likewise.
	* sysdeps/mach/hurd/sigprocmask.c: Likewise.
	* sysdeps/mach/hurd/sigstack.c: Likewise.
	* sysdeps/mach/hurd/sigsuspend.c: Likewise.
	* sysdeps/mach/hurd/socket.c: Likewise.
	* sysdeps/mach/hurd/socketpair.c: Likewise.
	* sysdeps/mach/hurd/stdio_init.c: Likewise.
	* sysdeps/mach/hurd/symlink.c: Likewise.
	* sysdeps/mach/hurd/sync.c: Likewise.
	* sysdeps/mach/hurd/sysd-stdio.c: Likewise.
	* sysdeps/mach/hurd/telldir.c: Likewise.
	* sysdeps/mach/hurd/truncate.c: Likewise.
	* sysdeps/mach/hurd/umask.c: Likewise.
	* sysdeps/mach/hurd/unlink.c: Likewise.
	* sysdeps/mach/hurd/wait4.c: Likewise.
	* sysdeps/mach/hurd/utimes.c: Likewise.
	* sysdeps/mach/hurd/write.c: Likewise.
	* sysdeps/mach/adjtime.c: Likewise.
	* sysdeps/mach/gettimeofday.c: Likewise.
	* sysdeps/mach/usleep.c: Likewise.
	* sysdeps/mips/__longjmp.c: Likewise.
	* sysdeps/posix/clock.c: Likewise.
	* sysdeps/posix/ctermid.c: Likewise.
	* sysdeps/posix/defs.c: Likewise.
	* sysdeps/posix/dup.c: Likewise.
	* sysdeps/posix/libc_fatal.c: Likewise.
	* sysdeps/posix/stdio_init.c: Likewise.
	* sysdeps/rs6000/ffs.c: Likewise.
	* sysdeps/sparc/e_sqrt.c: Likewise.
	* sysdeps/standalone/i386/force_cpu386/_exit.c: Likewise.
	* sysdeps/standalone/i386/force_cpu386/brdinit.c: Likewise.
	* sysdeps/standalone/i386/force_cpu386/console.c: Likewise.
	* sysdeps/standalone/i960/nindy960/_exit.c: Likewise.
	* sysdeps/standalone/i960/nindy960/brdinit.c: Likewise.
	* sysdeps/standalone/i960/nindy960/console.c: Likewise.
	* sysdeps/standalone/m68k/m68020/mvme136/_exit.c: Likewise.
	* sysdeps/standalone/m68k/m68020/mvme136/brdinit.c: Likewise.
	* sysdeps/standalone/brk.c: Likewise.
	* sysdeps/stub/_exit.c: Likewise.
	* sysdeps/stub/brdinit.c: Likewise.
	* sysdeps/stub/console.c: Likewise.
	* sysdeps/stub/defs.c: Likewise.
	* sysdeps/stub/errlist.c: Likewise.
	* sysdeps/stub/libc_fatal.c: Likewise.
	* sysdeps/stub/siglist.c: Likewise.
	* sysdeps/stub/stdio_init.c: Likewise.
	* sysdeps/stub/strtsupp.c: Likewise.
	* sysdeps/unix/bsd/bsd4.4/tcgetattr.c: Likewise.
	* sysdeps/unix/bsd/bsd4.4/tcsetattr.c: Likewise.
	* sysdeps/unix/bsd/bsd4.4/wait3.c: Likewise.
	* sysdeps/unix/bsd/sun/sunos4/tcflow.c: Likewise.
	* sysdeps/unix/bsd/sun/sunos4/tcflush.c: Likewise.
	* sysdeps/unix/bsd/sun/sunos4/tcgetattr.c: Likewise.
	* sysdeps/unix/bsd/sun/sunos4/tcsendbrk.c: Likewise.
	* sysdeps/unix/bsd/sun/sunos4/wait4.c: Likewise.
	* sysdeps/unix/bsd/ultrix4/mips/sigvec.c: Likewise.
	* sysdeps/unix/bsd/bsdstat.h: Likewise.
	* sysdeps/unix/bsd/clock.c: Likewise.
	* sysdeps/unix/bsd/gtty.c: Likewise.
	* sysdeps/unix/bsd/init-posix.c: Likewise.
	* sysdeps/unix/bsd/setgid.c: Likewise.
	* sysdeps/unix/bsd/setrgid.c: Likewise.
	* sysdeps/unix/bsd/setruid.c: Likewise.
	* sysdeps/unix/bsd/setuid.c: Likewise.
	* sysdeps/unix/bsd/stty.c: Likewise.
	* sysdeps/unix/bsd/telldir.c: Likewise.
	* sysdeps/unix/bsd/ualarm.c: Likewise.
	* sysdeps/unix/common/glue-ctype.c: Likewise.
	* sysdeps/unix/sparc/start.c: Likewise.
	* sysdeps/unix/sysv/irix4/fpathconf.c: Likewise.
	* sysdeps/unix/sysv/irix4/getgroups.c: Likewise.
	* sysdeps/unix/sysv/irix4/getrusage.c: Likewise.
	* sysdeps/unix/sysv/irix4/pathconf.c: Likewise.
	* sysdeps/unix/sysv/irix4/setgroups.c: Likewise.
	* sysdeps/unix/sysv/irix4/sigtramp.c: Likewise.
	* sysdeps/unix/sysv/irix4/start.c: Likewise.
	* sysdeps/unix/sysv/irix4/sysconf.c: Likewise.
	* sysdeps/unix/sysv/sco3.2.4/__setpgid.c: Likewise.
	* sysdeps/unix/sysv/sco3.2.4/getgroups.c: Likewise.
	* sysdeps/unix/sysv/sysv4/__getpgid.c: Likewise.
	* sysdeps/unix/sysv/sysv4/__setpgid.c: Likewise.
	* sysdeps/unix/sysv/sysv4/ftruncate.c: Likewise.
	* sysdeps/unix/sysv/sysv4/gethostname.c: Likewise.
	* sysdeps/unix/sysv/sysv4/getpgid.c: Likewise.
	* sysdeps/unix/sysv/sysv4/sethostname.c: Likewise.
	* sysdeps/unix/sysv/sysv4/setpgid.c: Likewise.
	* sysdeps/unix/sysv/sysv4/setsid.c: Likewise.
	* sysdeps/unix/sysv/gethostname.c: Likewise.
	* sysdeps/unix/sysv/tcgetpgrp.c: Likewise.
	* sysdeps/unix/sysv/tcsetpgrp.c: Likewise.
	* sysdeps/unix/alarm.c: Likewise.
	* sysdeps/unix/make_errlist.c: Likewise.
	* sysdeps/unix/rewinddir.c: Likewise.
	* sysdeps/unix/seekdir.c: Likewise.
	* sysdeps/unix/time.c: Likewise.
	* sysdeps/unix/utime.c: Likewise.
	* sysdeps/vax/__longjmp.c: Likewise.
	* sysdeps/vax/memccpy.c: Likewise.
	* time/strftime.c: Likewise.

1997-05-25 21:57  Miles Bader  <miles@gnu.ai.mit.edu>

	* argp-parse.c (parser_init): For the special case where no
	parsing function is supplied for an argp, propagate its input to
	its first child, if any.

	* argp.h (struct argp_state): `argp' field renamed to `root_argp'.
	* argp-help.c (__argp_state_help, argp_args_usage, hol_help):
	Replace references to STATE->argp with STATE->root_argp.
	* argp-parse.c (parser_init): Likewise.

1997-05-26 14:17  Ulrich Drepper  <drepper@cygnus.com>

	* manual/main.texi: Clarify situation for other not supported ports.
	Proposed by Andreas Jaeger <aj@arthur.rhein-neckar.de>.
	We recommend binutils 2.8.

1997-05-26 12:17  Ulrich Drepper  <drepper@cygnus.com>

	* netinet/in.h: New file.  Wrapper around inet/netinet/in.h.

1997-05-25 09:51  H.J. Lu  <hjl@gnu.ai.mit.edu>

	* sysdeps/i386/elf/start.S: Change local label "nofini"
	to ".Lnofini".

	* sysdeps/i386/i386-mcount.S: Use GOT, instead of GOTOFF.

1997-05-24 17:45  H.J. Lu  <hjl@gnu.ai.mit.edu>

	* gmon/gmon.c (_mcleanup): Free tostruct array allocated in monstartup.

	(dl_main): Define _dl_verbose based on DL_WARN environment variable.

2 files changed, 52 insertions, 24 deletions

diff --git a/manual/maint.texi b/manual/maint.texi
index b7401b8897..38d9786b9f 100644
--- a/manual/maint.texi
+++ b/manual/maint.texi
@@ -206,11 +206,11 @@ compiler.  We recommend GCC version 2.7.2 or later; earlier versions may
 have problems.
 
 @item
-@code{binutils} 2.7
+@code{binutils} 2.8
 
 Using the GNU @code{binutils} (assembler, linker, and related tools) is
 preferable when possible, and they are required to build an ELF shared C
-library.  We recommend @code{binutils} version 2.7 or later; earlier
+library.  We recommend @code{binutils} version 2.8 or later; earlier
 versions are known to have problems or to not support all architectures.
 @end itemize
 
@@ -222,14 +222,21 @@ The GNU C Library currently supports configurations that match the
 following patterns:
 
 @smallexample
-alpha-dec-osf1
 alpha-@var{anything}-linux
 alpha-@var{anything}-linuxecoff
-i@var{x}86-@var{anything}-bsd4.3
 i@var{x}86-@var{anything}-gnu
+i@var{x}86-@var{anything}-linux
+m68k-@var{anything}-linux
+@end smallexample
+
+Former releases of this library (version 1.09.1 and perhaps earlier
+versions) used to run on the following configurations:
+
+@smallexample
+alpha-dec-osf1
+i@var{x}86-@var{anything}-bsd4.3
 i@var{x}86-@var{anything}-isc2.2
 i@var{x}86-@var{anything}-isc3.@var{n}
-i@var{x}86-@var{anything}-linux
 i@var{x}86-@var{anything}-sco3.2
 i@var{x}86-@var{anything}-sco3.2v4
 i@var{x}86-@var{anything}-sysv
@@ -249,8 +256,14 @@ sparc-sun-solaris2.@var{n}
 sparc-sun-sunos4.@var{n}
 @end smallexample
 
+Since no one has volunteered to test and fix the above configurations,
+these are not supported at the moment.  It's expected that these don't
+work anymore.  Porting the library is not hard.  If you are interested
+in doing a port, please contact the glibc maintainers by sending
+electronic mail to @email{bug-glibc@@prep.ai.mit.edu}.
+
 Each case of @samp{i@var{x}86} can be @samp{i386}, @samp{i486},
-@samp{i586}, or @samp{i686}..  All of those configurations produce a
+@samp{i586}, or @samp{i686}.  All of those configurations produce a
 library that can run on any of these processors.  The library will be
 optimized for the specified processor, but will not use instructions not
 available on all of them.
@@ -309,8 +322,8 @@ conform to the ISO and POSIX standards (@pxref{Standards and
 Portability}), that is definitely a bug.  Report it!@refill
 
 Send bug reports to the Internet address
-@samp{bug-glibc@@prep.ai.mit.edu} or the UUCP path
-@samp{mit-eddie!prep.ai.mit.edu!bug-glibc}.  If you have other problems
+@email{bug-glibc@@prep.ai.mit.edu} or the UUCP path
+@email{mit-eddie!prep.ai.mit.edu!bug-glibc}.  If you have other problems
 with installation or use, please report those as well.@refill
 
 If you are not sure how a function should behave, and this manual
@@ -318,8 +331,8 @@ doesn't tell you, that's a bug in the manual.  Report that too!  If the
 function's behavior disagrees with the manual, then either the library
 or the manual has a bug, so report the disagreement.  If you find any
 errors or omissions in this manual, please report them to the Internet
-address @samp{bug-glibc-manual@@prep.ai.mit.edu} or the UUCP path
-@samp{mit-eddie!prep.ai.mit.edu!bug-glibc-manual}.
+address @email{bug-glibc-manual@@prep.ai.mit.edu} or the UUCP path
+@email{mit-eddie!prep.ai.mit.edu!bug-glibc-manual}.
 
 @node Source Layout
 @appendixsec Adding New Functions
@@ -1060,7 +1073,7 @@ Carnegie Mellon requests users of this software to return to
 @end display
 
 @noindent
-or @samp{Software.Distribution@@CS.CMU.EDU} any improvements or
+or @email{Software.Distribution@@CS.CMU.EDU} any improvements or
 extensions that they make and grant Carnegie Mellon the rights to
 redistribute these changes.
 @end quotation
diff --git a/manual/texinfo.tex b/manual/texinfo.tex
index 6bae66900a..e5982dc386 100644
--- a/manual/texinfo.tex
+++ b/manual/texinfo.tex
@@ -1,5 +1,5 @@
 %% TeX macros to handle Texinfo files.
-%% $Id: texinfo.tex,v 2.199 1997/05/20 11:11:48 drepper Exp $
+%% $Id: texinfo.tex,v 2.200 1997/05/26 22:19:32 drepper Exp $
 
 %  Copyright (C) 1985, 86, 88, 90, 91, 92, 93,
 %                94, 95, 96, 97 Free Software Foundation, Inc.
@@ -36,7 +36,7 @@
 
 % This automatically updates the version number based on RCS.
 \def\deftexinfoversion$#1: #2 ${\def\texinfoversion{#2}}
-\deftexinfoversion$Revision: 2.199 $
+\deftexinfoversion$Revision: 2.200 $
 \message{Loading texinfo package [Version \texinfoversion]:}
 
 % If in a .fmt file, print the version number
@@ -120,7 +120,7 @@
 
 % For @cropmarks command.
 % Do @cropmarks to get crop marks.
-% 
+%
 \newif\ifcropmarks
 \let\cropmarks = \cropmarkstrue
 %
@@ -1890,7 +1890,7 @@ July\or August\or September\or October\or November\or December\fi
 \def\itemizeitem{%
 \advance\itemno by 1
 {\let\par=\endgraf \smallbreak}%
-\ifhmode \errmessage{\in hmode at itemizeitem}\fi
+\ifhmode \errmessage{In hmode at itemizeitem}\fi
 {\parskip=0in \hskip 0pt
 \hbox to 0pt{\hss \itemcontents\hskip \itemmargin}%
 \vadjust{\penalty 1200}}%
@@ -2555,7 +2555,7 @@ width0pt\relax} \fi
 \def\begindoublecolumns{\begingroup % ended by \enddoublecolumns
   % Grab any single-column material above us.
   \output = {\global\setbox\partialpage = \vbox{%
-    % 
+    %
     % Here is a possibility not foreseen in manmac: if we accumulate a
     % whole lot of material, we might end up calling this \output
     % routine twice in a row (see the doublecol-lose test, which is
@@ -3685,16 +3685,17 @@ width0pt\relax} \fi
 
 % Definitions of (, ) and & used in args for functions.
 % This is the definition of ( outside of all parentheses.
-\gdef\oprm#1 {{\rm\char`\(}#1 \bf \let(=\opnested %
-\global\advance\parencount by 1 }
+\gdef\oprm#1 {{\rm\char`\(}#1 \bf \let(=\opnested
+  \global\advance\parencount by 1
+}
 %
 % This is the definition of ( when already inside a level of parens.
 \gdef\opnested{\char`\(\global\advance\parencount by 1 }
 %
 \gdef\clrm{% Print a paren in roman if it is taking us back to depth of 0.
-% also in that case restore the outer-level definition of (.
-\ifnum \parencount=1 {\rm \char `\)}\sl \let(=\oprm \else \char `\) \fi
-\global\advance \parencount by -1 }
+  % also in that case restore the outer-level definition of (.
+  \ifnum \parencount=1 {\rm \char `\)}\sl \let(=\oprm \else \char `\) \fi
+  \global\advance \parencount by -1 }
 % If we encounter &foo, then turn on ()-hacking afterwards
 \gdef\amprm#1 {{\rm\&#1}\let(=\oprm \let)=\clrm\ }
 %
@@ -3702,8 +3703,11 @@ width0pt\relax} \fi
 } % End of definition inside \activeparens
 %% These parens (in \boldbrax) actually are a little bolder than the
 %% contained text.  This is especially needed for [ and ]
-\def\opnr{{\sf\char`\(}} \def\clnr{{\sf\char`\)}} \def\ampnr{\&}
-\def\lbrb{{\bf\char`\[}} \def\rbrb{{\bf\char`\]}}
+\def\opnr{{\sf\char`\(}\global\advance\parencount by 1 }
+\def\clnr{{\sf\char`\)}\global\advance\parencount by -1 }
+\def\ampnr{\&}
+\def\lbrb{{\bf\char`\[}}
+\def\rbrb{{\bf\char`\]}}
 
 % First, defname, which formats the header line itself.
 % #1 should be the function name.
@@ -3880,7 +3884,7 @@ width0pt\relax} \fi
 \hyphenchar\tensl=0
 #1%
 \hyphenchar\tensl=45
-\ifnum\parencount=0 \else \errmessage{unbalanced parens in @def arguments}\fi%
+\ifnum\parencount=0 \else \errmessage{Unbalanced parentheses in @def}\fi%
 \interlinepenalty=10000
 \advance\rightskip by 0pt plus 1fil
 \endgraf\penalty 10000\vskip -\parskip\penalty 10000%
@@ -3981,6 +3985,7 @@ width0pt\relax} \fi
 \def\defmacx #1 {\errmessage{@defmacx in invalid context}}
 \def\defspecx #1 {\errmessage{@defspecx in invalid context}}
 \def\deftypefnx #1 {\errmessage{@deftypefnx in invalid context}}
+\def\deftypemethodx #1 {\errmessage{@deftypemethodx in invalid context}}
 \def\deftypeunx #1 {\errmessage{@deftypeunx in invalid context}}
 
 % @defmethod, and so on
@@ -3996,6 +4001,16 @@ width0pt\relax} \fi
 \defunargs {#3}\endgroup %
 }
 
+% @deftypemethod foo-class return-type foo-method args
+%
+\def\deftypemethod{%
+  \defmethparsebody\Edeftypemethod\deftypemethodx\deftypemethodheader}
+%
+% #1 is the class name, #2 the data type, #3 the method name, #4 the args.
+\def\deftypemethodheader#1#2#3#4{%
+  \deftypefnheaderx{Method on #1}{#2}#3 #4\relax
+}
+
 % @defmethod == @defop Method
 
 \def\defmethod{\defmethparsebody\Edefmethod\defmethodx\defmethodheader}