diff options
| author | tsi <tsi> | 2003-12-30 01:45:07 +0000 |
|---|---|---|
| committer | tsi <tsi> | 2003-12-30 01:45:07 +0000 |
| commit | 76e612e11752ea0283bb84ae7d2e3cdcfd56651a (patch) | |
| tree | 9b2981c2d47850c2a0263a7c7be50af7c371dd8c | |
| parent | 2a408c88ee1114e83e6f372ba0588f6c1566f7ae (diff) | |
708. Fix warning in lib/Xt/Alloc.c (Bugzilla #1035, Nicolas Jolly).
| -rw-r--r-- | lib/Xt/Alloc.c | 10 | ||||
| -rw-r--r-- | programs/Xserver/hw/xfree86/CHANGELOG | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/lib/Xt/Alloc.c b/lib/Xt/Alloc.c index 64de54ebc..42154bccc 100644 --- a/lib/Xt/Alloc.c +++ b/lib/Xt/Alloc.c @@ -58,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/Alloc.c,v 1.8 2001/08/22 22:52:17 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Alloc.c,v 1.9 2001/12/14 19:56:07 dawes Exp $ */ /* * X Toolkit Memory Allocation Routines @@ -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 diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG index 4d160b183..a5f183f45 100644 --- a/programs/Xserver/hw/xfree86/CHANGELOG +++ b/programs/Xserver/hw/xfree86/CHANGELOG @@ -1,4 +1,5 @@ XFree86 4.3.99.903 (xx December 2003) + 708. Fix warning in lib/Xt/Alloc.c (Bugzilla #1035, Nicolas Jolly). 707. Fix short overflow problem with box clipping in fb/fbcopy.c (Bugzilla #978, Stephen McCamant). 706. Fix logic in xterm's get_pty() for platforms where old-style pty's are @@ -18413,7 +18414,7 @@ XFree86 3.0a (28 April 1994) XFree86 3.0 (26 April 1994) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3055 2003/12/25 22:04:01 dickey Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3056 2003/12/28 17:22:25 alanh Exp $ |