summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2007-08-20 22:31:39 +0000
committerPeter Palfrader <peter@palfrader.org>2007-08-20 22:31:39 +0000
commit6802923fa7e6ec2adb8bd7b94fa0c232b0549287 (patch)
treecf247b252e780c086e07f1bdebe8a4309b0c5312
parent8aceafc0c882f9678c223e233b8c8d455f24c525 (diff)
downloadtor-6802923fa7e6ec2adb8bd7b94fa0c232b0549287.tar.gz
tor-6802923fa7e6ec2adb8bd7b94fa0c232b0549287.zip
call it EXPORTMALLINFO, not EXPORTMEMINFO
svn:r11235
-rw-r--r--ChangeLog2
-rw-r--r--src/or/directory.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 109c4b38fd..15c8eeef40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,7 +16,7 @@ Changes in version 0.2.0.6-alpha - 2007-??-??
a descriptor immediately, e.g. because they don't know their
address.
o Minor features (misc):
- - Optionally (if built with -DEXPORTMEMINFO) export the output
+ - Optionally (if built with -DEXPORTMALLINFO) export the output
of mallinfo via http, as tor/mallinfo.txt. Only accessible
from localhost.
diff --git a/src/or/directory.c b/src/or/directory.c
index da09109de9..f6a2c666ff 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -6,7 +6,7 @@ const char directory_c_id[] =
"$Id$";
#include "or.h"
-#if defined(EXPORTMEMINFO) && defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
+#if defined(EXPORTMALLINFO) && defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
#include <malloc.h>
#endif
@@ -2196,7 +2196,7 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
goto done;
}
-#if defined(EXPORTMEMINFO) && defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
+#if defined(EXPORTMALLINFO) && defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
#define ADD_MALLINFO_LINE(x) do { \
tor_snprintf(tmp, sizeof(tmp), "%s %d\n", #x, mi.x); \
smartlist_add(lines, tor_strdup(tmp)); \