Fix build in MacOS after ent changes

	* modules/cl/cl.c: Add ent/ent.h include
	* src/alloc.c: Add ent/ent.h, ent/ent-float.h and ent/ent-mpfr.h includes
	* src/ent/ent-float.h: Include ent/ent-optable.h and
	ent/ent-lift.h which define symbols used

	* src/ent/ent-gaussian.c: Ditto.

	* src/ent/ent-inf.h: Add additional includes (like in ent.h) for
	the cases when ent.h was not included.

	* src/ent/ent-mpc.c: Include ent.h and ent-mpfr.h

	* src/ent/ent-mpfr.c: Include ent.h, and optable, lift and indef

	* src/ent/ent-mpfr.h: Include ent-indef.h

	* src/ent/ent-quatern.c: Include ent.h

	* src/media/media.c: Include ent/ent.h

	* src/ui/glyphs.c: Include ent/ent-float.h

Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>

diff --git a/modules/cl/cl.c b/modules/cl/cl.c
index 078b072..e881780 100644 (file)
--- a/modules/cl/cl.c
+++ b/modules/cl/cl.c
@@ -43,6 +43,8 @@
 #include "cl-loop.h"
 #endif
 
+#include <ent/ent.h>
+
 PROVIDE(cl);
 #if !defined EMOD_CL_MONOMOD
 #define INIT   cl_LTX_init

diff --git a/src/alloc.c b/src/alloc.c
index 60fe882..6c9f89d 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -60,6 +60,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #include "ui/window.h"
 #include "ui/console-stream.h"
 
+#include <ent/ent.h>
+#include <ent/ent-float.h>
+#include <ent/ent-mpfr.h>
+
 #ifdef DOUG_LEA_MALLOC
 #include <malloc.h>
 #endif

diff --git a/src/ent/ent-float.h b/src/ent/ent-float.h
index 72eb7f9..3ae45c1 100644 (file)
--- a/src/ent/ent-float.h
+++ b/src/ent/ent-float.h
@@ -64,6 +64,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 # include <errno.h>
 #endif
 
+#include <ent/ent-optable.h>
 \f
 extern Lisp_Object Qfloat;
 
@@ -112,6 +113,7 @@ extern Lisp_Object make_float(fpfloat);
 
 #include "ent-inf.h"
 #include "ent-strflt.h"
+#include "ent-lift.h"
 
 #if fpfloat_long_double_p && defined(HAVE_MATHS_LDBL_MAX)
 # define FPFLOAT_MAX   LDBL_MAX

diff --git a/src/ent/ent-gaussian.c b/src/ent/ent-gaussian.c
index 61fd433..be9dc14 100644 (file)
--- a/src/ent/ent-gaussian.c
+++ b/src/ent/ent-gaussian.c
@@ -26,6 +26,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #include "lisp.h"
 #include "sysproc.h"    /* For qxe_getpid */
 
+#include "ent.h"
+#include "ent-float.h"
+#include "ent-mpfr.h"
 #include "ent-gaussian.h"
 #ifdef HAVE_MPC
 #include "ent-mpc.h"

diff --git a/src/ent/ent-inf.h b/src/ent/ent-inf.h
index 95d801b..31de811 100644 (file)
--- a/src/ent/ent-inf.h
+++ b/src/ent/ent-inf.h
@@ -24,6 +24,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #ifndef INCLUDED_ent_inf_h_
 #define INCLUDED_ent_inf_h_
 
+#if defined HAVE_MATH_H
+# include <math.h>
+#endif /* HAVE_MATH_H */
+#if defined HAVE_LIMITS_H
+# include <limits.h>
+#endif /* HAVE_LIMITS_H */
+#if defined HAVE_VALUES_H
+# include <values.h>
+#endif /* HAVE_VALUES_H */
+
 #if defined HAVE_STDBOOL_H
 # include <stdbool.h>
 #endif /* HAVE_STDBOOL_H */

diff --git a/src/ent/ent-mpc.c b/src/ent/ent-mpc.c
index c15da06..d7a65c0 100644 (file)
--- a/src/ent/ent-mpc.c
+++ b/src/ent/ent-mpc.c
@@ -26,6 +26,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #include "lisp.h"
 #include "sysproc.h"    /* For qxe_getpid */
 
+#include "ent.h"
+#include "ent-mpfr.h"
 #include "ent-mpc.h"
 
 bigc ent_scratch_bigc;

diff --git a/src/ent/ent-mpfr.c b/src/ent/ent-mpfr.c
index aafed6b..cbc4dd0 100644 (file)
--- a/src/ent/ent-mpfr.c
+++ b/src/ent/ent-mpfr.c
@@ -26,6 +26,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #include "lisp.h"
 #include "sysproc.h"    /* For qxe_getpid */
 
+#include "ent.h"
+#include "ent-optable.h"
+#include "ent-lift.h"
+#include "ent-indef.h"
 #include "ent-mpfr.h"
 
 \f

diff --git a/src/ent/ent-mpfr.h b/src/ent/ent-mpfr.h
index 2825352..30e7b5f 100644 (file)
--- a/src/ent/ent-mpfr.h
+++ b/src/ent/ent-mpfr.h
@@ -31,6 +31,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <mpfr.h>
 
+#include <ent/ent-indef.h>
+
 typedef mpfr_t bigfr;
 typedef mp_prec_t bigfr_prec;
 typedef mp_rnd_t bigfr_rnd;

diff --git a/src/ent/ent-quatern.c b/src/ent/ent-quatern.c
index 66469fc..fdc0320 100644 (file)
--- a/src/ent/ent-quatern.c
+++ b/src/ent/ent-quatern.c
@@ -26,6 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #include "lisp.h"
 #include "sysproc.h"    /* For qxe_getpid */
 
+#include "ent.h"
 #include "ent-quatern.h"
 
 quatern ent_scratch_quatern;

diff --git a/src/media/media.c b/src/media/media.c
index 715db6f..cc1707a 100644 (file)
--- a/src/media/media.c
+++ b/src/media/media.c
@@ -21,6 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 #include "lisp.h"
+#include <ent/ent.h>
 
 #include "buffer.h"
 

diff --git a/src/ui/glyphs.c b/src/ui/glyphs.c
index 213b27b..13a67f6 100644 (file)
--- a/src/ui/glyphs.c
+++ b/src/ui/glyphs.c
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #include <config.h>
 #include "lisp.h"
 
-#include "mem/blocktype.h"
+#include <mem/blocktype.h>
 #include "buffer.h"
 #include "chartab.h"
 #include "device.h"
@@ -44,6 +44,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #include "redisplay.h"
 #include "specifier.h"
 #include "window.h"
+#include <ent/ent-float.h>
 
 #ifdef HAVE_XPM
 #include <X11/xpm.h>