diff options
| -rw-r--r-- | libiberty/ChangeLog | 7 | ||||
| -rw-r--r-- | libiberty/pexecute.c | 8 | ||||
| -rw-r--r-- | libiberty/xmalloc.c | 22 |
3 files changed, 22 insertions, 15 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 70dc8ddda72..e0b3aa4f072 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,10 @@ +Sun Apr 11 23:20:59 1999 Mumit Khan <khan@xraylith.wisc.edu> + + * pexecute.c: Change all references to __UWIN__ to _UWIN. + * xmalloc.c: Likewise. + (xcalloc): UWIN has sbrk. + (xrealloc): Fix guard macro. + 1999-04-11 Mark Mitchell <mark@codesourcery.com> * cplus-dem.c (demangle_template_value_parm): Handle diff --git a/libiberty/pexecute.c b/libiberty/pexecute.c index 49d04a88407..6f6a0449d09 100644 --- a/libiberty/pexecute.c +++ b/libiberty/pexecute.c @@ -230,7 +230,7 @@ pwait (pid, status, flags) #endif /* MSDOS */ -#if defined (_WIN32) && ! defined (__UWIN__) +#if defined (_WIN32) && ! defined (_UWIN) #include <process.h> @@ -419,7 +419,7 @@ pwait (pid, status, flags) #endif /* __CYGWIN__ */ } -#endif /* _WIN32 && ! __UWIN__ */ +#endif /* _WIN32 && ! _UWIN */ #ifdef OS2 @@ -602,7 +602,7 @@ pfinish () /* include for Unix-like environments but not for Dos-like environments */ #if ! defined (__MSDOS__) && ! defined (OS2) && ! defined (MPW) \ - && ! (defined (_WIN32) && ! defined (__UWIN__)) + && ! (defined (_WIN32) && ! defined (_UWIN)) extern int execv (); extern int execvp (); @@ -731,4 +731,4 @@ pwait (pid, status, flags) return pid; } -#endif /* ! __MSDOS__ && ! OS2 && ! MPW && ! (_WIN32 && ! __UWIN__) */ +#endif /* ! __MSDOS__ && ! OS2 && ! MPW && ! (_WIN32 && ! _UWIN) */ diff --git a/libiberty/xmalloc.c b/libiberty/xmalloc.c index 1a12511cf9f..1bc15c99cd6 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 (__CYGWIN__) || defined (__UWIN__) +#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 /* ! _WIN32 || __CYGWIN __ || __UWIN__ */ +#endif /* ! _WIN32 || __CYGWIN__ || _UWIN */ void xmalloc_set_program_name (s) const char *s; { name = s; -#if ! defined (_WIN32) || defined (__CYGWIN__) || defined (__UWIN__) +#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 || __CYGWIN __ || __UWIN__ */ +#endif /* ! _WIN32 || __CYGWIN__ || _UWIN */ } PTR @@ -72,7 +72,7 @@ xmalloc (size) newmem = malloc (size); if (!newmem) { -#if ! defined (_WIN32) || defined (__CYGWIN__) || defined (__UWIN__) +#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 || __CYGWIN __ || __UWIN__ */ +#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 (__CYGWIN__) +#if ! defined (_WIN32) || defined (__CYGWIN__) || defined (_UWIN) 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 || __CYGWIN __ */ +#endif /* ! _WIN32 || __CYGWIN__ || _UWIN */ xexit (1); } return (newmem); @@ -145,7 +145,7 @@ xrealloc (oldmem, size) newmem = realloc (oldmem, size); if (!newmem) { -#ifndef __MINGW32__ +#if ! defined (_WIN32) || defined (__CYGWIN__) || defined (_UWIN) extern char **environ; size_t allocated; @@ -157,12 +157,12 @@ xrealloc (oldmem, size) "\n%s%sCan not reallocate %lu bytes after allocating %lu bytes\n", name, *name ? ": " : "", (unsigned long) size, (unsigned long) allocated); -#else +#else /* ! _WIN32 || __CYGWIN__ || _UWIN */ fprintf (stderr, "\n%s%sCan not reallocate %lu bytes\n", name, *name ? ": " : "", (unsigned long) size); -#endif /* __MINGW32__ */ +#endif /* ! _WIN32 || __CYGWIN__ || _UWIN */ xexit (1); } return (newmem); |