Build Fix -- compatibility issue with newer autoconf

[sxemacs] / src / ent / ent.c

diff --git a/src/ent/ent.c b/src/ent/ent.c
index 08ad31b..885e181 100644 (file)
--- a/src/ent/ent.c
+++ b/src/ent/ent.c
@@ -253,9 +253,9 @@ Return t if OBJECT is a real, nil otherwise.
 }
 
 static int
-default_real_precision_changed (Lisp_Object sym, Lisp_Object *val,
-                               Lisp_Object in_object,
-                               int flags)
+default_real_precision_changed (Lisp_Object SXE_UNUSED(sym), Lisp_Object *val,
+                               Lisp_Object SXE_UNUSED(in_object),
+                               int SXE_UNUSED(flags))
 {
        unsigned long prec;
 
@@ -270,11 +270,6 @@ default_real_precision_changed (Lisp_Object sym, Lisp_Object *val,
                bigfr_set_default_prec(prec);
 #endif
        return 0;
-
-       /* less warnings */
-       if (sym == Qnil);
-       if (in_object == Qnil);
-       if (flags);
 }
 
 DEFUN("real", Freal, 1, 2, 0,  /*
@@ -301,7 +296,7 @@ If optional argument PRECISION is non-nil, its value
 #endif /* HAVE_MPF */
        }
 
-        /* fallback to 'float */
+       /* fallback to 'float */
        return Fcoerce_number(number, Qfloat, precision);
 }
 
@@ -476,17 +471,14 @@ int ase_optable_index(Lisp_Object arg)
                case lrecord_type_marker:
                        return INT_T;
                case lrecord_type_dynacat:
-                       if (SYMBOLP(XDYNACAT_TYPE(arg))) {
-                               /* must be an dynacat */
-                               /* now we've got two options, either compute a
-                                * hash-value from the symbol's address
-                                * or store a cookie in the plist of the symbol
-                                * for the moment, we prefer the latter option
-                                */
-                               return ase_optable_index_typesym(
-                                       XDYNACAT_TYPE(arg));
-                       }
-                       break;
+                       assert(SYMBOLP(XDYNACAT_TYPE(arg)));
+                       /* must be an dynacat */
+                       /* now we've got two options, either compute a
+                        * hash-value from the symbol's address
+                        * or store a cookie in the plist of the symbol
+                        * for the moment, we prefer the latter option
+                        */
+                       return ase_optable_index_typesym(XDYNACAT_TYPE(arg));
                default:
                        return type;
                }
@@ -494,17 +486,15 @@ int ase_optable_index(Lisp_Object arg)
        default:
                return INT_T;
        }
-       return -1;
+       return -1; /* Should not reach here */
 }
 
 int
 ase_optable_index_typesym(Lisp_Object typesym)
 {
        Lisp_Object idx = Fget(typesym, Qoptable_index, Qnil);
-       if (INTEGERP(idx))
-               return XINT(idx);
-       else
-               return -1;
+       assert(INTEGERP(idx));
+       return XINT(idx);
 }
 
 /* categorial subtleties */
@@ -588,17 +578,17 @@ TYPE is one of the symbols:
 - 'fixnum or 'int     to convert to built-in integers
 - 'bigz or 'bignum    to convert to bigz integers
 - 'integer            to convert to the most suitable type out of
-                      'bigz or 'int
+                     'bigz or 'int
 
 - 'bigq or 'ratio     to convert to bigq fractions
 - 'rational           to convert to the most suitable type out of
-                      'bigq, 'bigz or 'int
+                     'bigq, 'bigz or 'int
 
 - 'float              to convert to built-in floats
 - 'bigf or 'bigfloat  to convert to bigf floats
 - 'bigfr              to convert to bigfr floats
-- 'real               to convert to the type indicated by 
-                      `read-real-as' with a fallback to 'float
+- 'real               to convert to the type indicated by
+                     `read-real-as' with a fallback to 'float
 
 - 'bigg               to convert to a Gaussian
 - 'bigc               to convert to a bigc complex number
@@ -659,7 +649,7 @@ cases; the information is silently lost.
        }
 #endif /* HAVE_MPF */
 #if defined HAVE_MPFR && defined WITH_MPFR
-       else if (EQ(type, Qbigfr)) { 
+       else if (EQ(type, Qbigfr)) {
                la.precision = internal_get_precision(precision);
                return ent_lift(number, BIGFR_T, &la);
        }
@@ -676,7 +666,7 @@ cases; the information is silently lost.
                else if (Vread_real_as == Qbigfr)
                        return ent_lift(number, BIGFR_T, &la);
 #endif
-               else 
+               else
                        return ent_lift(number, FLOAT_T, &la);
        }
 #if defined(HAVE_PSEUG) && defined WITH_PSEUG
@@ -940,7 +930,7 @@ arbitrary-precision floats.
        DEFVAR_LISP("read-real-as", &Vread_real_as /*
 *Indicate how real numbers should be read.
 If set to `nil' or 'float, reals are always converted to floats.
-If set to 'bigf or 'bigfr, reals are read as MPF floats or MPFR 
+If set to 'bigf or 'bigfr, reals are read as MPF floats or MPFR
 floats respectively.
                                                   */);
        Vread_real_as = Qfloat;