[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] r11235: call it EXPORTMALLINFO, not EXPORTMEMINFO (in tor/trunk: . src/or)



Author: weasel
Date: 2007-08-20 18:31:39 -0400 (Mon, 20 Aug 2007)
New Revision: 11235

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/directory.c
Log:
call it EXPORTMALLINFO, not EXPORTMEMINFO

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-08-20 22:23:22 UTC (rev 11234)
+++ tor/trunk/ChangeLog	2007-08-20 22:31:39 UTC (rev 11235)
@@ -16,7 +16,7 @@
       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.
 

Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c	2007-08-20 22:23:22 UTC (rev 11234)
+++ tor/trunk/src/or/directory.c	2007-08-20 22:31:39 UTC (rev 11235)
@@ -6,7 +6,7 @@
   "$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 @@
     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));                      \