cosmetics, include ent/ent.h (or one of its sub-includes) directly, take 2, ...

This changeset will have a follow-up that fixes the lisp.h b0rkedness

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>

diff --git a/src/callint.c b/src/callint.c
index 66b584d..d5de135 100644 (file)
--- a/src/callint.c
+++ b/src/callint.c
@@ -28,6 +28,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"
 #include "bytecode.h"

diff --git a/src/events/event-stream.c b/src/events/event-stream.c
index 11c9a76..126d4f3 100644 (file)
--- a/src/events/event-stream.c
+++ b/src/events/event-stream.c
@@ -92,6 +92,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #include "sysfile.h"
 #include "systime.h"           /* to set Vlast_input_time */
 
+/* for extract_float() and CHECK_NUMBER */
+#include "ent/ent.h"
+
 #include "events-mod.h"
 #ifdef EF_USE_ASYNEQ
 #include "event-queue.h"

diff --git a/src/map.c b/src/map.c
index b5b0372..883022f 100644 (file)
--- a/src/map.c
+++ b/src/map.c
@@ -47,6 +47,7 @@
 #include "map.h"
 #include "dict.h"
 #include "skiplist.h"
+#include "ent/ent.h"
 
 Lisp_Object Qmap;
 Lisp_Object Q_arity, Q_result_type, Q_mode, Q_glue;

diff --git a/src/media/sound.c b/src/media/sound.c
index 1eca185..de5cb6b 100644 (file)
--- a/src/media/sound.c
+++ b/src/media/sound.c
@@ -75,6 +75,9 @@ Lisp_Object Qplay_sound;
 #include "sound-oss.h"
 #endif
 
+/* for CHECK_NUMBER and COMPARABLEP */
+#include "ent/ent.h"
+
 Lisp_Object Qaudio_devicep;
 Lisp_Object Qaudio_jobp;
 Lisp_Object Vdefault_audio_device;

diff --git a/src/skiplist.c b/src/skiplist.c
index 9f21ce7..65f43c1 100644 (file)
--- a/src/skiplist.c
+++ b/src/skiplist.c
@@ -46,6 +46,8 @@
 #include "lrecord.h"
 #include "lstream.h"
 
+/* for __ase_ffs() */
+#include "ent/ent.h"
 #include "skiplist.h"
 
 #define __SKIPLIST_DEBUG__(args...)    fprintf(stderr, "SKIPLIST " args)
@@ -113,8 +115,6 @@ static inline skiplist_level_t
 skiplist_find_hash_return_level(skiplist_t, hcode_t)
        __attribute__((always_inline));
 
-extern int get_random(void);
-
 /* high level bindings */
 \f
 /* low level bindings */

diff --git a/src/sysdep.c b/src/sysdep.c
index 53f9068..7ffad2f 100644 (file)
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -2981,6 +2981,10 @@ get_process_times(double *user_time, double *system_time, double *real_time)
 #endif
 #endif
 
+#if defined HAVE_MPZ && (defined WITH_GMP || defined WITH_MP)
+# include "ent/ent-gmp.h"
+#endif /* MPZ && (GMP || MP) */
+
 /* Figure out how many bits the system's random number generator uses.
    `random' and `lrand48' are assumed to return 31 usable bits.
    BSD `rand' returns a 31 bit value but the low order bits are unusable;

diff --git a/src/ui/TTY/objects-tty.c b/src/ui/TTY/objects-tty.c
index edd79ba..a59f3f9 100644 (file)
--- a/src/ui/TTY/objects-tty.c
+++ b/src/ui/TTY/objects-tty.c
@@ -31,6 +31,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #include "ui/device.h"
 #include "mule/mule-charset.h"
 #endif
+
+/* for CHECK_INT_OR_FLOAT */
+#include "ent/ent.h"
+
 #include "skiplist.h"
 
 /* Term => ( color => '(index bold) ) */