wip

src/logging.cc

@@ -29,57 +29,60 @@
 
 #define _GNU_SOURCE 1 // needed for O_NOFOLLOW and pread()/pwrite()
 
+#include "glog/logging.h"
+
 #include <algorithm>
 #include <cassert>
 #include <cstddef>
 #include <iomanip>
 #include <iterator>
 #include <string>
 
+#include "base/commandlineflags.h"  // to get the program name
+#include "base/googleinit.h"
 #include "config.h"
+#include "glog/raw_logging.h"
 #include "utilities.h"
 
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>  // For _exit.
-#endif
-#include <climits>
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifdef HAVE_SYS_UTSNAME_H
-# include <sys/utsname.h>  // For uname.
+#ifdef HAVE_STACKTRACE
+#include "stacktrace.h"
 #endif
-#include <ctime>
+
 #include <fcntl.h>
-#include <cstdio>
-#include <iostream>
+#include <sys/stat.h>
+
+#include <cctype>  // for std::isspace
+#include <cerrno>  // for errno
+#include <climits>
 #include <cstdarg>
+#include <cstdio>
 #include <cstdlib>
-#ifdef HAVE_PWD_H
-# include <pwd.h>
-#endif
-#ifdef HAVE_SYSLOG_H
-# include <syslog.h>
-#endif
-#ifdef HAVE__CHSIZE_S
-#include <io.h> // for truncate log file
-#endif
-#include <vector>
-#include <cerrno>                   // for errno
-#include <sstream>
+#include <ctime>
+#include <iostream>
 #include <regex>
-#include <cctype> // for std::isspace
+#include <sstream>
+#include <vector>
+
 #ifdef GLOG_OS_WINDOWS
 #include "windows/dirent.h"
 #else
 #include <dirent.h> // for automatic removal of old logs
 #endif
-#include "base/commandlineflags.h"  // to get the program name
-#include "base/googleinit.h"
-#include "glog/logging.h"
-#include "glog/raw_logging.h"
 
-#ifdef HAVE_STACKTRACE
-# include "stacktrace.h"
+#ifdef HAVE__CHSIZE_S
+#include <io.h>  // for truncate log file
+#endif
+#ifdef HAVE_SYS_UTSNAME_H
+#include <sys/utsname.h>  // For uname.
+#endif
+#ifdef HAVE_PWD_H
+#include <pwd.h>
+#endif
+#ifdef HAVE_SYSLOG_H
+#include <syslog.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>  // For _exit.
 #endif
 
 #ifdef __ANDROID__