From 89f602a7935fc9b2c799f4eec45b803cb792f1ba Mon Sep 17 00:00:00 2001
From: Mumit Khan <khan@xraylith.wisc.edu>
Date: Thu, 11 Mar 1999 00:32:50 +0000
Subject: pexecute.c (__CYGWIN32__): Rename to
* pexecute.c (__CYGWIN32__): Rename to
(__CYGWIN__): this.
* xmalloc.c: Likewise.
Changes to support i386-pc-uwin.
* configure.in (*-*-uwin*): Workaround for vfork bug.
* configure: Regenerate.
* pexecute.c (pexecute): Be like standard Unix.
(pwait): Likewise.
* xmalloc.c (first_break): Define.
(xmalloc_set_program_name): Use.
(xmalloc): Use.
From-SVN: r25694
---
libiberty/xmalloc.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
(limited to 'libiberty/xmalloc.c')
diff --git a/libiberty/xmalloc.c b/libiberty/xmalloc.c
index 4f39014..1a12511 100644
--- a/libiberty/xmalloc.c
+++ b/libiberty/xmalloc.c
@@ -43,22 +43,22 @@ PTR sbrk PARAMS ((ptrdiff_t));
/* The program name if set. */
static const char *name = "";
-#if ! defined (_WIN32) || defined (__CYGWIN32__)
+#if ! defined (_WIN32) || defined (__CYGWIN__) || defined (__UWIN__)
/* The initial sbrk, set when the program name is set. Not used for win32
ports other than cygwin32. */
static char *first_break = NULL;
-#endif
+#endif /* ! _WIN32 || __CYGWIN __ || __UWIN__ */
void
xmalloc_set_program_name (s)
const char *s;
{
name = s;
-#if ! defined (_WIN32) || defined (__CYGWIN32__)
+#if ! defined (_WIN32) || defined (__CYGWIN__) || defined (__UWIN__)
/* Win32 ports other than cygwin32 don't have brk() */
if (first_break == NULL)
first_break = (char *) sbrk (0);
-#endif /* ! _WIN32 || __CYGWIN32 __ */
+#endif /* ! _WIN32 || __CYGWIN __ || __UWIN__ */
}
PTR
@@ -72,7 +72,7 @@ xmalloc (size)
newmem = malloc (size);
if (!newmem)
{
-#if ! defined (_WIN32) || defined (__CYGWIN32__)
+#if ! defined (_WIN32) || defined (__CYGWIN__) || defined (__UWIN__)
extern char **environ;
size_t allocated;
@@ -89,7 +89,7 @@ xmalloc (size)
"\n%s%sCan not allocate %lu bytes\n",
name, *name ? ": " : "",
(unsigned long) size);
-#endif /* ! _WIN32 || __CYGWIN32 __ */
+#endif /* ! _WIN32 || __CYGWIN __ || __UWIN__ */
xexit (1);
}
return (newmem);
@@ -107,7 +107,7 @@ xcalloc (nelem, elsize)
newmem = calloc (nelem, elsize);
if (!newmem)
{
-#if ! defined (_WIN32) || defined (__CYGWIN32__)
+#if ! defined (_WIN32) || defined (__CYGWIN__)
extern char **environ;
size_t allocated;
@@ -124,7 +124,7 @@ xcalloc (nelem, elsize)
"\n%s%sCan not allocate %lu bytes\n",
name, *name ? ": " : "",
(unsigned long) (nelem * elsize));
-#endif /* ! _WIN32 || __CYGWIN32 __ */
+#endif /* ! _WIN32 || __CYGWIN __ */
xexit (1);
}
return (newmem);
--
cgit v1.1