scratch/comp-static-data 43bf8ccb66f 2/2: Merge alloc.h into lisp.h.

[Vibhav Pant]

branch: scratch/comp-static-data
commit 43bf8ccb66fbb319190fee35008b88bef67ab1c9
Author: Vibhav Pant <vibhavp@gmail.com>
Commit: Vibhav Pant <vibhavp@gmail.com>

    Merge alloc.h into lisp.h.
    
    * src/lisp.h: Move declarations from alloc.h.
    * src/alloc.c: Remove alloc.h include.
    * src/comp.c: Remove alloc.h include.
---
 src/alloc.c |  1 -
 src/alloc.h | 35 -----------------------------------
 src/comp.c  |  1 -
 src/lisp.h  | 11 +++++++++++
 4 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/src/alloc.c b/src/alloc.c
index 58e7c4bc4aa..f342f10992d 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -30,7 +30,6 @@ along with GNU Emacs.  If not, see 
<https://www.gnu.org/licenses/>.  */
 #include <pthread.h>
 #endif
 
-#include "alloc.h"
 #include "lisp.h"
 #include "bignum.h"
 #include "dispextern.h"
diff --git a/src/alloc.h b/src/alloc.h
deleted file mode 100644
index 026d62c6a97..00000000000
--- a/src/alloc.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Allocation-related definitions, used by comp.c
-
- Copyright (C) 2019-2022 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
-
-#ifndef ALLOC_H
-#define ALLOC_H
-
-#ifdef HAVE_NATIVE_COMP
-
-extern const size_t block_align;
-
-extern const size_t float_block_floats_length;
-extern const size_t float_block_gcmarkbits_length;
-
-extern const size_t cons_block_conses_length;
-extern const size_t cons_block_gcmarkbits_length;
-
-#endif /* #ifndef HAVE_NATIVE_COMP */
-
-#endif /* #ifndef ALLOC_H */
diff --git a/src/comp.c b/src/comp.c
index a2cb51180cd..24e760032af 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -40,7 +40,6 @@ along with GNU Emacs.  If not, see 
<https://www.gnu.org/licenses/>.  */
 #include "md5.h"
 #include "sysstdio.h"
 #include "zlib.h"
-#include "alloc.h"
 
 
 /********************************/
diff --git a/src/lisp.h b/src/lisp.h
index ce4493c3b2d..dc042e67ff6 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4268,6 +4268,17 @@ static_comp_object_p (Lisp_Object obj)
 }
 #endif
 
+#ifdef HAVE_NATIVE_COMP
+extern const size_t block_align;
+
+extern const size_t float_block_floats_length;
+extern const size_t float_block_gcmarkbits_length;
+
+extern const size_t cons_block_conses_length;
+extern const size_t cons_block_gcmarkbits_length;
+#endif /* #ifndef HAVE_NATIVE_COMP */
+
+
 /* Force callee-saved registers and register windows onto the stack,
    so that conservative garbage collection can see their values.  */
 #ifndef HAVE___BUILTIN_UNWIND_INIT