diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:29:25 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:29:25 +0000 |
| commit | 226ceb39dc66ef795ba1bad9b5eac598693eefff (patch) | |
| tree | 95523639c16fcf0d75ff25d451e8acbe10699e4e /src/Alloc.c | |
| parent | 74a94933d160fc9b82c5f5e1c895cb52689f3e41 (diff) | |
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGECYGWIN-PRE-6_8_0-MERGECYGWIN-HEAD-MERGECYGWIN-HEAD-LAST-MERGE
Diffstat (limited to 'src/Alloc.c')
| -rw-r--r-- | src/Alloc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Alloc.c b/src/Alloc.c index 80fadfb..42154bc 100644 --- a/src/Alloc.c +++ b/src/Alloc.c @@ -117,7 +117,7 @@ char *XtMalloc(size) { char *ptr; -#if defined (MALLOC_0_RETURNS_NULL) && defined(XTMALLOC_BC) +#if defined(MALLOC_0_RETURNS_NULL) && defined(XTMALLOC_BC) /* preserve this (broken) behavior until everyone fixes their apps */ if (!size) size = 1; #endif @@ -132,12 +132,12 @@ char *XtRealloc(ptr, size) unsigned size; { if (ptr == NULL) { -#if MALLOC_0_RETURNS_NULL +#ifdef MALLOC_0_RETURNS_NULL if (!size) size = 1; #endif return(XtMalloc(size)); } else if ((ptr = Xrealloc(ptr, size)) == NULL -#if MALLOC_0_RETURNS_NULL +#ifdef MALLOC_0_RETURNS_NULL && size #endif ) @@ -151,7 +151,7 @@ char *XtCalloc(num, size) { char *ptr; -#if defined (MALLOC_0_RETURNS_NULL) && defined(XTMALLOC_BC) +#if defined(MALLOC_0_RETURNS_NULL) && defined(XTMALLOC_BC) /* preserve this (broken) behavior until everyone fixes their apps */ if (!size) num = size = 1; #endif |