Fix typo in recent code to add stack recursion limit to the Rust demangler.

[thirdparty/gcc.git] / libiberty / alloca.c

diff --git a/libiberty/alloca.c b/libiberty/alloca.c
index 918235df465203df525fe58b41afc9ab53b1a4cf..b75f7560f9456131ad7d27ebdda2a1170f87675e 100644 (file)
--- a/libiberty/alloca.c
+++ b/libiberty/alloca.c
@@ -57,9 +57,15 @@ the possibility of a GCC built-in function.
 
 /* These variables are used by the ASTRDUP implementation that relies
    on C_alloca.  */
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
 const char *libiberty_optr;
 char *libiberty_nptr;
 unsigned long libiberty_len;
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
 
 /* If your stack is a linked list of frames, you have to
    provide an "address metric" ADDRESS_FUNCTION macro.  */
@@ -97,7 +103,7 @@ static int stack_dir;                /* 1 or -1 once known.  */
 #define        STACK_DIR       stack_dir
 
 static void
-find_stack_direction ()
+find_stack_direction (void)
 {
   static char *addr = NULL;    /* Address of first `dummy', once known.  */
   auto char dummy;             /* To get stack address.  */
@@ -152,9 +158,8 @@ static header *last_alloca_header = NULL;   /* -> last alloca header.  */
 
 /* @undocumented C_alloca */
 
-PTR
-C_alloca (size)
-     size_t size;
+void *
+C_alloca (size_t size)
 {
   auto char probe;             /* Probes stack depth: */
   register char *depth = ADDRESS_FUNCTION (probe);
@@ -176,7 +181,7 @@ C_alloca (size)
        {
          register header *np = hp->h.next;
 
-         free ((PTR) hp);      /* Collect garbage.  */
+         free ((void *) hp);   /* Collect garbage.  */
 
          hp = np;              /* -> next header.  */
        }
@@ -192,20 +197,20 @@ C_alloca (size)
   /* Allocate combined header + user data storage.  */
 
   {
-    register PTR new = xmalloc (sizeof (header) + size);
+    register void *new_storage = XNEWVEC (char, sizeof (header) + size);
     /* Address of header.  */
 
-    if (new == 0)
+    if (new_storage == 0)
       abort();
 
-    ((header *) new)->h.next = last_alloca_header;
-    ((header *) new)->h.deep = depth;
+    ((header *) new_storage)->h.next = last_alloca_header;
+    ((header *) new_storage)->h.deep = depth;
 
-    last_alloca_header = (header *) new;
+    last_alloca_header = (header *) new_storage;
 
     /* User storage begins just after header.  */
 
-    return (PTR) ((char *) new + sizeof (header));
+    return (void *) ((char *) new_storage + sizeof (header));
   }
 }