[NOT TO COMMIT!] r109: Diff of the current tcmalloc from the original google-perftools r109.

third_party/tcmalloc/chromium/src/windows/nm-pdb.c

Index: third_party/tcmalloc/chromium/src/windows/nm-pdb.c
diff --git a/third_party/tcmalloc/chromium/src/windows/nm-pdb.c b/third_party/tcmalloc/chromium/src/windows/nm-pdb.c
index 9beb21dea99a80a07004d5366e1b3783ad9a46eb..726d345953aeb9033c595698d70150dbe944a155 100644
--- a/third_party/tcmalloc/chromium/src/windows/nm-pdb.c
+++ b/third_party/tcmalloc/chromium/src/windows/nm-pdb.c
@@ -180,10 +180,6 @@ static void ShowSymbolInfo(HANDLE process, ULONG64 module_base) {
 #endif
 }
 
-void usage() {
-  fprintf(stderr, "usage: nm-pdb [-C|--demangle] <module or filename>\n");
-}
-
 int main(int argc, char *argv[]) {
   DWORD  error;
   HANDLE process;
@@ -199,15 +195,12 @@ int main(int argc, char *argv[]) {
   for (i = 1; i < argc; i++) {
     if (strcmp(argv[i], "--demangle") == 0 || strcmp(argv[i], "-C") == 0) {
       symopts |= SYMOPT_UNDNAME;
-    } else if (strcmp(argv[i], "--help") == 0) {
-      usage();
-      exit(0);
     } else {
       break;
     }
   }
   if (i != argc - 1) {
-    usage();
+    fprintf(stderr, "usage: nm-pdb [-C|--demangle] <module or filename>\n");
     exit(1);
   }
   filename = argv[i];