Import Upstream version 5e2upstream/5e2

1 files changed, 17 insertions, 14 deletions

diff --git a/scm.texi b/scm.texi
index 698bb6b..2625130 100644
--- a/scm.texi
+++ b/scm.texi
@@ -533,34 +533,34 @@ low priority.  SLIB is available from the same sites as SCM:
 @ifclear html
 @itemize @bullet
 @item
-swiss.csail.mit.edu:/pub/scm/slib3a2.tar.gz
+swiss.csail.mit.edu:/pub/scm/slib3a3.tar.gz
 @item
-ftp.gnu.org:/pub/gnu/jacal/slib3a2.tar.gz
+ftp.gnu.org:/pub/gnu/jacal/slib3a3.tar.gz
 @item
-ftp.cs.indiana.edu:/pub/scheme-repository/imp/slib3a2.tar.gz
+ftp.cs.indiana.edu:/pub/scheme-repository/imp/slib3a3.tar.gz
 @end itemize
 @end ifclear
 
 @ifset html
 @itemize @bullet
 @item
-<A HREF="http://swiss.csail.mit.edu/ftpdir/scm/slib3a2.zip">
-http://swiss.csail.mit.edu/ftpdir/scm/slib3a2.zip
+<A HREF="http://swiss.csail.mit.edu/ftpdir/scm/slib3a3.zip">
+http://swiss.csail.mit.edu/ftpdir/scm/slib3a3.zip
 </A>
 @item
-<A HREF="ftp://ftp.gnu.org/pub/gnu/jacal/slib3a2.tar.gz">
-ftp.gnu.org:/pub/gnu/jacal/slib3a2.tar.gz
+<A HREF="ftp://ftp.gnu.org/pub/gnu/jacal/slib3a3.tar.gz">
+ftp.gnu.org:/pub/gnu/jacal/slib3a3.tar.gz
 </A>
 @item
-<A HREF="ftp://ftp.cs.indiana.edu/pub/scheme-repository/code/lib/slib3a2.tar.gz">
-ftp.cs.indiana.edu:/pub/scheme-repository/code/lib/slib3a2.tar.gz
+<A HREF="ftp://ftp.cs.indiana.edu/pub/scheme-repository/code/lib/slib3a3.tar.gz">
+ftp.cs.indiana.edu:/pub/scheme-repository/code/lib/slib3a3.tar.gz
 </A>
 @end itemize
 @end ifset
 
 @noindent
-Unpack SLIB (@samp{tar xzf slib3a2.tar.gz} or @samp{unzip -ao
-slib3a2.zip}) in an appropriate directory for your system; both
+Unpack SLIB (@samp{tar xzf slib3a3.tar.gz} or @samp{unzip -ao
+slib3a3.zip}) in an appropriate directory for your system; both
 @code{tar} and @code{unzip} will create the directory @file{slib}.
 
 @noindent
@@ -1054,6 +1054,7 @@ the compilation command lines or add a @code{#define @var{flag}} line to
 ARM_ULIB        Huw Rogers free unix library for acorn archimedes
 AZTEC_C         Aztec_C 5.2a
 __CYGWIN__      Cygwin
+__CYGWIN32__    Cygwin
 _DCC            Dice C on AMIGA
 __GNUC__        Gnu CC (and DJGPP)
 __EMX__         Gnu C port (gcc/emx 0.8e) to OS/2 2.0
@@ -1083,6 +1084,7 @@ linux           Linux
 macintosh       Macintosh (THINK_C and __MWERKS__ define)
 MCH_AMIGA       Aztec_c 5.2a on AMIGA
 __MACH__        Apple Darwin
+__MINGW32__     MinGW - Minimalist GNU for Windows
 MSDOS           Microsoft C 5.10 and 6.00A
 _MSDOS          Microsoft CLARM and CLTHUMB compilers.
 __MSDOS__       Turbo C, Borland C, and DJGPP
@@ -1124,6 +1126,7 @@ sparc           SPARC processor
 sequent         Sequent computer
 tahoe           CCI Tahoe processor
 vax             VAX processor
+__x86_64        AMD Opteron
 @end example
 
 @node Problems Compiling, Problems Linking, Automatic C Preprocessor Definitions, Installing SCM
@@ -4052,7 +4055,7 @@ identifiers defined in the file accessible as Scheme procedures.
 @defun dyn:main-call name link-token arg1 @dots{}
 @var{link-token} should be the value returned by a call to
 @code{dyn:link}.  @var{name} should be the name of C function of 2
-arguments, @code{(int argc, char **argv)}, defined in the file named
+arguments, @code{(int argc, const char **argv)}, defined in the file named
 @var{filename} which was succesfully @code{dyn:link}ed in the current
 SCM session.  The @code{dyn:main-call} procedure calls the C function
 corresponding to @var{name} with @code{argv} style arguments, such as
@@ -7865,7 +7868,7 @@ SCM user_main()
 
 int main(argc, argv)
      int argc;
-     char **argv;
+     const char **argv;
 @{
   SCM retval;
   char *implpath, *execpath;
@@ -8382,7 +8385,7 @@ for the first occurrence.  Thus, it is advisable to invoke
 @code{dld_init} as:
 
 @example
-main (int argc, char **argv)
+main (int argc, const char **argv)
 @{
     @dots{}
     if (dld_init (dld_find_executable (argv[0]))) @{