Reorg for including libiberty.h, [part 4/4]

[Kaveh R. Ghazi]

	This is part 4/4.  Okay to install?



Sun Nov 22 08:46:44 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>

	* choose-temp.c: Always include libiberty.h.  Avoid redundancies.
	* cplus-dem.c: Likewise.  Conform to libiberty.h.
	* pexecute.c: Likewise.
	* splay-tree.c: Likewise.
	

diff -rup orig/egcs-CVS19981119/libiberty/choose-temp.c egcs-CVS19981119/libiberty/choose-temp.c
--- orig/egcs-CVS19981119/libiberty/choose-temp.c	Thu Nov 19 16:12:03 1998
+++ egcs-CVS19981119/libiberty/choose-temp.c	Fri Nov 20 15:53:01 1998
@@ -50,12 +50,10 @@ Boston, MA 02111-1307, USA.  */
 #include <stdio.h>	/* May get P_tmpdir.  */
 #endif /* IN_GCC */
 
+#include "libiberty.h"
 #ifdef IN_GCC
-extern char *xmalloc ();
 extern int mkstemps ();
 #else
-#include "ansidecl.h"
-#include "libiberty.h"
 #if defined (__MSDOS__) || defined (_WIN32)
 #define DIR_SEPARATOR '\\'
 #endif
diff -rup orig/egcs-CVS19981119/libiberty/cplus-dem.c egcs-CVS19981119/libiberty/cplus-dem.c
--- orig/egcs-CVS19981119/libiberty/cplus-dem.c	Thu Nov 19 16:12:02 1998
+++ egcs-CVS19981119/libiberty/cplus-dem.c	Fri Nov 20 15:53:01 1998
@@ -48,8 +48,7 @@ char * realloc ();
 #undef CURRENT_DEMANGLING_STYLE
 #define CURRENT_DEMANGLING_STYLE work->options
 
-extern char *xmalloc PARAMS((unsigned));
-extern char *xrealloc PARAMS((char *, unsigned));
+#include "libiberty.h"
 
 static const char *mystrstr PARAMS ((const char *, const char *));
 
@@ -3963,22 +3962,22 @@ fatal (str)
   exit (1);
 }
 
-char *
+PTR
 xmalloc (size)
-     unsigned size;
+  size_t size;
 {
-  register char *value = (char *) malloc (size);
+  register PTR value = (PTR) malloc (size);
   if (value == 0)
     fatal ("virtual memory exhausted");
   return value;
 }
 
-char *
+PTR
 xrealloc (ptr, size)
-     char *ptr;
-     unsigned size;
+  PTR ptr;
+  size_t size;
 {
-  register char *value = (char *) realloc (ptr, size);
+  register PTR value = (PTR) realloc (ptr, size);
   if (value == 0)
     fatal ("virtual memory exhausted");
   return value;
diff -rup orig/egcs-CVS19981119/libiberty/pexecute.c egcs-CVS19981119/libiberty/pexecute.c
--- orig/egcs-CVS19981119/libiberty/pexecute.c	Thu Nov 19 16:12:06 1998
+++ egcs-CVS19981119/libiberty/pexecute.c	Fri Nov 20 15:53:01 1998
@@ -53,16 +53,7 @@ Boston, MA 02111-1307, USA.  */
                lib$get_current_invo_context(decc$$get_vfork_jmpbuf()) : -1)
 #endif /* VMS */
 
-#ifdef IN_GCC
-/* ??? Need to find a suitable header file.  */
-#define PEXECUTE_FIRST   1
-#define PEXECUTE_LAST    2
-#define PEXECUTE_ONE     (PEXECUTE_FIRST + PEXECUTE_LAST)
-#define PEXECUTE_SEARCH  4
-#define PEXECUTE_VERBOSE 8
-#else
 #include "libiberty.h"
-#endif
 
 /* stdin file number.  */
 #define STDIN_FILE_NO 0
diff -rup orig/egcs-CVS19981119/libiberty/splay-tree.c egcs-CVS19981119/libiberty/splay-tree.c
--- orig/egcs-CVS19981119/libiberty/splay-tree.c	Thu Nov 19 16:12:09 1998
+++ egcs-CVS19981119/libiberty/splay-tree.c	Fri Nov 20 15:53:01 1998
@@ -31,11 +31,7 @@
 #include <stdlib.h>
 #endif
 
-#ifndef IN_GCC
 #include "libiberty.h"
-#else /* IN_GCC */
-extern char* xmalloc ();
-#endif /* IN_GCC */
 #include "splay-tree.h"
 
 static void splay_tree_delete_helper    PARAMS((splay_tree,