Match commented argument names with actual names

[folly.git] / folly / init / Init.cpp

diff --git a/folly/init/Init.cpp b/folly/init/Init.cpp
index f325ba3487fb53f14410b27a3f1370384a8a8bd9..50f132e5ba4f59f4e73b77498086a7c09ecb34c1 100644 (file)
--- a/folly/init/Init.cpp
+++ b/folly/init/Init.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Facebook, Inc.
+ * Copyright 2017 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,41 +19,37 @@
 #include <glog/logging.h>
 
 #include <folly/Singleton.h>
-#if !defined(__APPLE__) && !defined(_WIN32)
-#define USE_FOLLY_SYMBOLIZER 1
-#endif
+#include <folly/portability/Config.h>
 
-#ifdef USE_FOLLY_SYMBOLIZER
-#include <folly/experimental/symbolizer/SignalHandler.h>
+#ifdef FOLLY_USE_SYMBOLIZER
+#include <folly/experimental/symbolizer/SignalHandler.h> // @manual
 #endif
 #include <folly/portability/GFlags.h>
 
 namespace folly {
 
 void init(int* argc, char*** argv, bool removeFlags) {
-#ifdef USE_FOLLY_SYMBOLIZER
+#ifdef FOLLY_USE_SYMBOLIZER
   // Install the handler now, to trap errors received during startup.
   // The callbacks, if any, can be installed later
   folly::symbolizer::installFatalSignalHandler();
-#else
+#elif !defined(_WIN32)
   google::InstallFailureSignalHandler();
 #endif
 
-  google::ParseCommandLineFlags(argc, argv, removeFlags);
+  // Move from the registration phase to the "you can actually instantiate
+  // things now" phase.
+  folly::SingletonVault::singleton()->registrationComplete();
+
+  gflags::ParseCommandLineFlags(argc, argv, removeFlags);
 
   auto programName = argc && argv && *argc > 0 ? (*argv)[0] : "unknown";
   google::InitGoogleLogging(programName);
 
-#ifdef USE_FOLLY_SYMBOLIZER
+#ifdef FOLLY_USE_SYMBOLIZER
   // Don't use glog's DumpStackTraceAndExit; rely on our signal handler.
   google::InstallFailureFunction(abort);
-#endif
-
-  // Move from the registration phase to the "you can actually instantiate
-  // things now" phase.
-  folly::SingletonVault::singleton()->registrationComplete();
 
-#ifdef USE_FOLLY_SYMBOLIZER
   // Actually install the callbacks into the handler.
   folly::symbolizer::installFatalSignalCallbacks();
 #endif