summaryrefslogtreecommitdiff
path: root/src/helper
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-05-09 19:03:03 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-05-09 19:03:03 +0000
commit36c8c0a069cae58ab802e190e98e62a863588923 (patch)
treed1926a7d526ee645e02f659fc58585ecd00d4041 /src/helper
parent52377759a2c5c6a291c9bbd110a7f9efca4e1e46 (diff)
downloadopenocd_libswd-36c8c0a069cae58ab802e190e98e62a863588923.tar.gz
openocd_libswd-36c8c0a069cae58ab802e190e98e62a863588923.tar.bz2
openocd_libswd-36c8c0a069cae58ab802e190e98e62a863588923.tar.xz
openocd_libswd-36c8c0a069cae58ab802e190e98e62a863588923.zip
printing available memory fails on win + mac. Disable for now until a robust way of doing this can be found.
git-svn-id: svn://svn.berlios.de/openocd/trunk@651 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/helper')
-rw-r--r--src/helper/log.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/helper/log.c b/src/helper/log.c
index bb82d10f..e9c1fa20 100644
--- a/src/helper/log.c
+++ b/src/helper/log.c
@@ -29,7 +29,9 @@
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
-#ifndef _WIN32
+
+#define PRINT_MEM() 0
+#if PRINT_MEM()
#include <malloc.h>
#endif
@@ -82,16 +84,16 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch
{
/* print with count and time information */
int t=(int)(timeval_ms()-start);
-#ifndef _WIN32
+#if PRINT_MEM()
struct mallinfo info;
info = mallinfo();
#endif
fprintf(log_output, "%s %d %d %s:%d %s()"
-#ifndef _WIN32
+#if PRINT_MEM()
" %d"
#endif
": %s", log_strings[level+1], count, t, file, line, function,
-#ifndef _WIN32
+#if PRINT_MEM()
info.fordblks,
#endif
string);