about summary refs log tree commit diff
path: root/manual
diff options
context:
space:
mode:
Diffstat (limited to 'manual')
-rw-r--r--manual/memory.texi20
-rw-r--r--manual/signal.texi3
-rw-r--r--manual/top-menu.texi7
3 files changed, 13 insertions, 17 deletions
diff --git a/manual/memory.texi b/manual/memory.texi
index b87bc3f160..a3cf3724b3 100644
--- a/manual/memory.texi
+++ b/manual/memory.texi
@@ -38,8 +38,6 @@ will be freed automatically.  @xref{Variable Size Automatic}.
 * Variable Size Automatic::     Allocation of variable-sized blocks
 				 of automatic storage that are freed when the
 				 calling function returns.
-* Relocating Allocator::        Waste less memory, if you can tolerate
-				 automatic relocation of the blocks you get.
 @end menu
 
 @node Memory Concepts
@@ -2030,7 +2028,8 @@ within one function, exiting a scope in which a variable-sized array was
 declared frees all blocks allocated with @code{alloca} during the
 execution of that scope.
 
-
+@ignore
+@c This was never actually implemented.  -zw
 @node Relocating Allocator
 @section Relocating Allocator
 
@@ -2040,10 +2039,10 @@ space it uses is more than the amount the program asks for.  The
 @dfn{relocating memory allocator} achieves very low overhead by moving
 blocks in memory as necessary, on its own initiative.
 
-@menu
-* Relocator Concepts::		How to understand relocating allocation.
-* Using Relocator::		Functions for relocating allocation.
-@end menu
+@c @menu
+@c * Relocator Concepts::		How to understand relocating allocation.
+@c * Using Relocator::		Functions for relocating allocation.
+@c @end menu
 
 @node Relocator Concepts
 @subsection Concepts of Relocating Allocation
@@ -2085,7 +2084,7 @@ extensions.
 
 @comment malloc.h
 @comment GNU
-@deftypefun {void *} r_alloc (void **@var{handleptr}, size_t @var{size})
+@c @deftypefun {void *} r_alloc (void **@var{handleptr}, size_t @var{size})
 This function allocates a relocatable block of size @var{size}.  It
 stores the block's address in @code{*@var{handleptr}} and returns
 a non-null pointer to indicate success.
@@ -2096,7 +2095,7 @@ in @code{*@var{handleptr}}, and returns a null pointer.
 
 @comment malloc.h
 @comment GNU
-@deftypefun void r_alloc_free (void **@var{handleptr})
+@c @deftypefun void r_alloc_free (void **@var{handleptr})
 This function is the way to free a relocatable block.  It frees the
 block that @code{*@var{handleptr}} points to, and stores a null pointer
 in @code{*@var{handleptr}} to show it doesn't point to an allocated
@@ -2105,7 +2104,7 @@ block any more.
 
 @comment malloc.h
 @comment GNU
-@deftypefun {void *} r_re_alloc (void **@var{handleptr}, size_t @var{size})
+@c @deftypefun {void *} r_re_alloc (void **@var{handleptr}, size_t @var{size})
 The function @code{r_re_alloc} adjusts the size of the block that
 @code{*@var{handleptr}} points to, making it @var{size} bytes long.  It
 stores the address of the resized block in @code{*@var{handleptr}} and
@@ -2114,6 +2113,7 @@ returns a non-null pointer to indicate success.
 If enough memory is not available, this function returns a null pointer
 and does not modify @code{*@var{handleptr}}.
 @end deftypefun
+@end ignore
 
 @ignore
 @comment No longer available...
diff --git a/manual/signal.texi b/manual/signal.texi
index 029485c8e0..b3f67b6685 100644
--- a/manual/signal.texi
+++ b/manual/signal.texi
@@ -1900,8 +1900,11 @@ handlers.  The obstack allocation functions are safe as long as you
 don't use the same obstack both inside and outside of a signal handler.
 @end ignore
 
+@ignore
+@comment Once we have r_alloc again add this paragraph.
 The relocating allocation functions (@pxref{Relocating Allocator})
 are certainly not safe to use in a signal handler.
+@end ignore
 
 @item
 Any function that modifies @code{errno} is non-reentrant, but you can
diff --git a/manual/top-menu.texi b/manual/top-menu.texi
index 6ff8bd64d1..05a8ed680e 100644
--- a/manual/top-menu.texi
+++ b/manual/top-menu.texi
@@ -116,8 +116,6 @@ Memory Allocation
 * Variable Size Automatic::     Allocation of variable-sized blocks
 				 of automatic storage that are freed when the
 				 calling function returns.
-* Relocating Allocator::        Waste less memory, if you can tolerate
-				 automatic relocation of the blocks you get.
 
 Unconstrained Allocation
 
@@ -176,11 +174,6 @@ Variable Size Automatic
 				 method of allocating dynamically and
 				 freeing automatically.
 
-Relocating Allocator
-
-* Relocator Concepts::		How to understand relocating allocation.
-* Using Relocator::		Functions for relocating allocation.
-
 Character Handling
 
 * Classification of Characters::   Testing whether characters are