Merged silc_1_0_branch to trunk.

[silc.git] / lib / silcutil / silcmemory.h

diff --git a/lib/silcutil/silcmemory.h b/lib/silcutil/silcmemory.h
index f05800bec6bf98fa623c81eec712bbbd4eeae58b..149e8c9044d9f72045ccc78dd82818507eefb7ee 100644 (file)
--- a/lib/silcutil/silcmemory.h
+++ b/lib/silcutil/silcmemory.h
@@ -17,7 +17,7 @@
 
 */
 
-/****h* silcutil/SilcMemoryAPI
+/****h* silcutil/SILC Memory Interface
  *
  * DESCRIPTION
  *
@@ -35,6 +35,8 @@
 
 /* Prototypes */
 
+#ifndef SILC_STACKTRACE
+
 /****f* silcutil/SilcMemoryAPI/silc_malloc
  *
  * SYNOPSIS
@@ -58,7 +60,7 @@ void *silc_malloc(size_t size);
  * DESCRIPTION
  *
  *    Allocates memory of for an array of `items' elements of `size' bytes
- *    and returns pointer to the allocated memory area.  The memory are is
+ *    and returns pointer to the allocated memory area.  The memory area is
  *    also zeroed.  Free the memory by calling silc_free.
  *
  ***/
@@ -117,4 +119,12 @@ void silc_free(void *ptr);
  ***/
 void *silc_memdup(const void *ptr, size_t size);
 
+#else
+#ifndef SILC_DIST_TOOLKIT
+#error "The stack trace is not supported in this distribution"
+#endif /* SILC_DIST_TOOLKIT */
+
+#include "stacktrace.h"
+#endif /* SILC_STACKTRACE */
+
 #endif /* SILCMEMORY_H */