* malloc.cc: Protect some definitions to avoid a compile time warning.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index b04e913..2b32b94 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-28  Christopher Faylor  <cgf@redhat.com>
+
+       * malloc.cc: Protect some definitions to avoid a compile time warning.
+
 2002-08-27  Nicholas Wourms  <nwourms@netscape.net>
 
        * cygwin.din: Export getc_unlocked, getchar_unlocked,

diff --git a/winsup/cygwin/malloc.cc b/winsup/cygwin/malloc.cc
index 02832bb..2e0a5cc 100644 (file)
--- a/winsup/cygwin/malloc.cc
+++ b/winsup/cygwin/malloc.cc
@@ -2510,14 +2510,18 @@ static void malloc_init_state(av) mstate av;
 
 #if __STD_C
 static Void_t*  sYSMALLOc(INTERNAL_SIZE_T, mstate);
+#ifndef MORECORE_CANNOT_TRIM
 static int      sYSTRIm(size_t, mstate);
+#endif
 static void     malloc_consolidate(mstate);
 #ifdef NEED_INDEPENDENT
 static Void_t** iALLOc(size_t, size_t*, int, Void_t**);
 #endif
 #else
 static Void_t*  sYSMALLOc();
+#ifndef MORECORE_CANNOT_TRIM
 static int      sYSTRIm();
+#endif
 static void     malloc_consolidate();
 #ifdef NEED_INDEPENDENT
 static Void_t** iALLOc();