Remove DECLARE_INTERVALS, INITIALIZE_INTERVAL. Don't

declare make_temp_name twice.

2 files changed, 31 insertions, 9 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a17b16c4e2d..26b9cd339d5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,34 @@
+2000-08-17  Dave Love  <fx@gnu.org>
+
+        * lisp.h: Remove DECLARE_INTERVALS, INITIALIZE_INTERVAL.  Don't
+        declare make_temp_name twice.
+
+        * lread.c: Prototype readevalloop, load_unwind,
+        load_descriptor_unwind.
+        (unreadpure): Give it an arg.
+
+        * unexalpha.c: Prototype fatal_unexec, mark_x,
+        update_dynamic_symbols.  Declare unexec as void.
+
+        * cm.c [HAVE_TERMCAP_H]: Include <termcap.h>.
+        [!HAVE_TERMCAP_H]: Prototype tputs, tgoto.
+
+        * alloc.c (lisp_malloc): Declare with POINTER_TYPE.
+        [SYSTEM_MALLOC]: Make decls in malloc.h conditional on
+        DOUG_LEA_MALLOC.
+
+        * alloca.c: Use #error.
+        [POINTER_TYPE]: Use it.
+
+        * eval.c (Fdefvar): Doc fix.
+
+        * buffer.c (Fget_buffer_create, Fmake_indirect_buffer): Avoid
+        INITIALIZE_INTERVAL.
+
+        * buffer.h: Avoid DECLARE_INTERVALS.
+
+        * config.in: Add size_t.
+
 2000-08-17  Eli Zaretskii  <eliz@is.elta.co.il>
 
         * w16select.c (set_clipboard_data): If there's not enough memory
diff --git a/src/lisp.h b/src/lisp.h
index dd98e4288e9..62ead3e4d36 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -572,15 +572,6 @@ typedef struct interval *INTERVAL;
 #define CHECK_STRING_OR_BUFFER(x, i) \
   { if (!STRINGP ((x)) && !BUFFERP ((x))) \
       x = wrong_type_argument (Qbuffer_or_string_p, (x)); }
-
-/* Macro used to conditionally compile intervals into certain data
-   structures.  See, e.g., struct Lisp_String below.  */
-#define DECLARE_INTERVALS INTERVAL intervals;
-
-/* Macro used to conditionally compile interval initialization into
-   certain code.  See, e.g., alloc.c.  */
-#define INITIALIZE_INTERVAL(ptr,val) ptr->intervals = val
-
 
 /* In a cons, the markbit of the car is the gc mark bit */