* libc/stdlib/mstats.c[_ELIX_LEVEL]: Fix guards. #ifndef FOO ||

	FOO >= 2 is invalid; use #if !defined (FOO) || FOO >= 2 instead.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 485dd23dbcc0764ae5116d469f78f8d63155eef0..addfa0354664f14feae282312d184ac758f6c579 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-04  Ben Elliston  <bje@wasabisystems.com>
+
+       * libc/stdlib/mstats.c[_ELIX_LEVEL]: Fix guards.  #ifndef FOO ||
+       FOO >= 2 is invalid; use #if !defined (FOO) || FOO >= 2 instead.
+
 2003-09-02  Thomas Pfaff  <tpfaff@gmx.net>
 
        * libc/stdlib/atexit.c: Rename _REENT to _GLOBAL_REENT throughout.

diff --git a/newlib/libc/stdlib/mstats.c b/newlib/libc/stdlib/mstats.c
index 8a587b0b57f7a03c4abaeab2cc21d9ec96ea2739..2b6c6bc196658ef60f454a982f4bb3c622905a18 100644 (file)
--- a/newlib/libc/stdlib/mstats.c
+++ b/newlib/libc/stdlib/mstats.c
@@ -110,7 +110,7 @@ _DEFUN_VOID (mallinfo)
   return _mallinfo_r (_REENT);
 }
 
-#ifndef _ELIX_LEVEL || _ELIX_LEVEL >= 2
+#if !defined (_ELIX_LEVEL) || _ELIX_LEVEL >= 2
 void
 _DEFUN_VOID (malloc_stats)
 {
@@ -129,7 +129,7 @@ _DEFUN (mallopt, (p, v),
 
 #endif
 
-#ifndef _ELIX_LEVEL || _ELIX_LEVEL >= 2
+#if !defined (_ELIX_LEVEL) || _ELIX_LEVEL >= 2
 
 /* mstats is now compatibility code.  It used to be real, for a
    previous version of the malloc routines.  It now just calls