Merge branch 'gawk-4.2-stable'

1 files changed, 10 insertions, 6 deletions

diff --git a/doc/gawktexi.in b/doc/gawktexi.in
index 518ab01f..807945eb 100644
--- a/doc/gawktexi.in
+++ b/doc/gawktexi.in
@@ -31902,13 +31902,18 @@ The @code{val_type} member indicates what kind of value the
 Using these macros makes accessing the fields of the @code{awk_value_t} more
 readable.
 
+@item enum AWK_NUMBER_TYPE @{
+@itemx @ @ @ @ AWK_NUMBER_TYPE_DOUBLE,
+@itemx @ @ @ @ AWK_NUMBER_TYPE_MPFR,
+@itemx @ @ @ @ AWK_NUMBER_TYPE_MPZ
+@itemx @};
+This @code{enum} is used in the following structure for defining the
+type of numeric value that is being worked with.  It is declared at the
+top level of the file so that it works correctly for C++ as well as for C.
+
 @item typedef struct awk_number @{
 @itemx @ @ @ @ double d;
-@itemx @ @ @ @ enum AWK_NUMBER_TYPE @{
-@itemx @ @ @ @ @ @ @ @ AWK_NUMBER_TYPE_DOUBLE,
-@itemx @ @ @ @ @ @ @ @ AWK_NUMBER_TYPE_MPFR,
-@itemx @ @ @ @ @ @ @ @ AWK_NUMBER_TYPE_MPZ
-@itemx @ @ @ @ @} type;
+@itemx @ @ @ @ enum AWK_NUMBER_TYPE type;
 @itemx @ @ @ @ void *ptr;
 @itemx @} awk_number_t;
 This represents a numeric value.  Internally, @command{gawk} stores
@@ -31923,7 +31928,6 @@ in data received from @command{gawk}. In addition, by examining the
 member is either a GMP integer (type @code{mpz_ptr}), or an MPFR
 floating-point value (type @code{mpfr_ptr_t}), and cast it appropriately.
 
-
 @item typedef void *awk_scalar_t;
 Scalars can be represented as an opaque type. These values are obtained
 from @command{gawk} and then passed back into it. This is discussed