Fix gawk_major_version in gawkapi.h; make NEWS correct (no intdiv).

3 files changed, 36 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index fa603448..997b9f83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-08-13         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawkapi.h (gawk_api_major_version): Reset to 2 after merging
+	in feature/api-mpfr branch.
+	* NEWS: `intdiv' is not built-in; remove the entry for up and update
+	numbering. Add note about API supporting GMP and MPFR values.
+
 2017-08-09         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* gawkapi.h (check_mpfr_versions): Define differently based on if
diff --git a/NEWS b/NEWS
index e4963d4e..a999492c 100644
--- a/NEWS
+++ b/NEWS
@@ -23,74 +23,70 @@ Changes from 4.1.x to 4.2.0
 4. The igawk script and igawk.1 man page are no longer installed by
    `make install'.  They have been obsolete since gawk 4.0.0.
 
-5. Gawk now has a `intdiv()' function to perform integer division; this is
-   primarily useful for the -M option to avoid MPFR division when all
-   values involved are integers.
-
-6. Gawk can now be built with CMake.  This is an alternative build
+5. Gawk can now be built with CMake.  This is an alternative build
    system for those who may want it; gawk is not going to switch off
    use of the autotools anytime soon, if ever.
 
-7. Gawk now processes a maximum of two hexadecimal digits in \x
+6. Gawk now processes a maximum of two hexadecimal digits in \x
    escape sequences inside strings.
 
-8. Setting PROCINFO["redirection", "NONFATAL"] to true makes I/O
+7. Setting PROCINFO["redirection", "NONFATAL"] to true makes I/O
    errors for "redirection" not fatal, setting ERRNO. Setting
    PROCINFO["NONFATAL"] makes all I/O nonfatal.
 
-9. MirBSD is no longer supported.
+8. MirBSD is no longer supported.
 
-10. Pretty printing now preserves comments and places them into the
+9. Pretty printing now preserves comments and places them into the
     pretty-printed file.
 
-11. `make install' now installs shell startup files
+10. `make install' now installs shell startup files
     $sysconfdir/profile.d/gawk.{csh,sh} containing shell functions to
     manipulate the AWKPATH and AWKLIBPATH environment variables.  On a Fedora
     system, these files belong in /etc/profile.d, but the appropriate location
     may be different on other platforms.
 
-12. Gawk now supports retryable I/O via PROCINFO[input-file, "RETRY"]; see
+11. Gawk now supports retryable I/O via PROCINFO[input-file, "RETRY"]; see
     the manual.
 
-13. The API minor version has been increased to 2; the get_file()
+12. The API minor version has been increased to 2; the get_file()
     API provides access to open redirections. Also see the manual.
 
-14. Revisions in the POSIX standard remove the special case for POSIX
+13. Revisions in the POSIX standard remove the special case for POSIX
     mode when FS = " " where newline was not a field separator. The code
     and doc have been updated.
 
-15. Gawk now supports strongly typed regexp constants. Such constants
+14. Gawk now supports strongly typed regexp constants. Such constants
     look like @/.../.  You can assign them to variables, pass them to
     functions, use them in ~, !~ and the case part of a switch statement.
     More details are provided in the manual.
 
-16. The new typeof() function can be used to indicate if a variable or
+15. The new typeof() function can be used to indicate if a variable or
     array element is an array, regexp, string or number.  The isarray()
     function is deprecated in favor of typeof().
 
-17. As promised when 4.1 was released, the old extension mechanism,
+16. As promised when 4.1 was released, the old extension mechanism,
     using the `extension' function, is now gone.
 
-18. Support for GNU/Linux on Alpha systems has been removed.
+17. Support for GNU/Linux on Alpha systems has been removed.
 
-19. Optimizations are now enabled by default. Use the new -s/--no-optimize
+18. Optimizations are now enabled by default. Use the new -s/--no-optimize
     option(s) to disable them.  Pretty-printing and profiling automatically
     disable optimizations so that the output program is the same as the
     original input program.
 
-20. The extension API now provides a mechanism for generating nonfatal
+19. The extension API now provides a mechanism for generating nonfatal
     error messages.
 
-20. Gawk now uses fwrite_unlocked if it's available. The yields a 7% - 18%
+21. Gawk now uses fwrite_unlocked if it's available. The yields a 7% - 18%
     improvement in raw output speed (gawk '{ print }' on a large file).
 
-21. Pretty-printing now uses the original text of constant numeric values for
+22. Pretty-printing now uses the original text of constant numeric values for
     pretty-printing and profiling.
 
-22. Passing negative operands to any of the bitwise functions now
+23. Passing negative operands to any of the bitwise functions now
     produces a fatal error.
 
-23. The C API has undergone changes that break binary compatibility with
+24. The C API has undergone changes that break binary compatibility with
     the previous version. Thus the API version is now at 2.0.  YOU WILL
     NEED TO RECOMPILE YOUR EXTENSIONS to work with this version of gawk.
     Source code compatibility remains intact, although you will get
@@ -98,31 +94,33 @@ Changes from 4.1.x to 4.2.0
     recommend that you do so.  Fortunately, the changes are fairly minor
     and straightforward.
 
-24. Programs that toggle IGNORECASE a lot should now be noticeably faster.
+25. Programs that toggle IGNORECASE a lot should now be noticeably faster.
 
-25. The mktime function now accepts an optional second argument. If this
+26. The mktime function now accepts an optional second argument. If this
     argument is present and is non-zero or non-null, the time will be converted
     from UTC instead of from the local timezone.
 
-26. The FIELDWIDTHS parsing syntax has been enhanced to allow specifying
+27. The FIELDWIDTHS parsing syntax has been enhanced to allow specifying
     how many characters to skip before a field starts. It also allows
     specifying '*' as the last character to mean "the rest of the record".
     Field splitting with FIELDWIDTHS now sets NF correctly.  The documentation
     for FIELDWIDTHS in the manual has been considerably reorganized and
     improved as well.
 
-27. An API input parser now has the ability to override the default field
+28. An API input parser now has the ability to override the default field
     parsing mechanism by specifying the locations of each field in the input
     record. When this is in effect, PROCINFO["FS"] will be set to "API".
 
-28. The PROCINFO["argv"] array records all of gawk's command line arguments
+29. The PROCINFO["argv"] array records all of gawk's command line arguments
     as gawk received them (the values of the C level argv array).
 
-29. Pretty-printing now preserves parenthesized expressions as they
+30. Pretty-printing now preserves parenthesized expressions as they
     were in the source file. This solves several niggling corner cases
     with such things.
 
-30. The DJGPP port has been revived and now has an official maintainer.
+31. The DJGPP port has been revived and now has an official maintainer.
+
+32. The API has been extended to give access to GMP and MPFR values.
 
 Changes from 4.1.3 to 4.1.4
 ---------------------------
diff --git a/gawkapi.h b/gawkapi.h
index 1c6c74ec..66bd85d3 100644
--- a/gawkapi.h
+++ b/gawkapi.h
@@ -296,7 +296,7 @@ typedef struct awk_two_way_processor {
 	awk_const struct awk_two_way_processor *awk_const next;  /* for use by gawk */
 } awk_two_way_processor_t;
 
-#define gawk_api_major_version 3
+#define gawk_api_major_version 2
 #define gawk_api_minor_version 0
 
 /* Current version of the API. */