From 3cef73d30d55b1002ffc5a04a89c739c4bc4f0e6 Mon Sep 17 00:00:00 2001
From: "Kevin M. Godby" <kevin@godby.org>
Date: Tue, 16 Jun 2020 13:23:45 -0500
Subject: [PATCH] Elevate #includes from being nested in the namespace.

---
 include/indicators/terminal_size.hpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/include/indicators/terminal_size.hpp b/include/indicators/terminal_size.hpp
index f75f10d..c2b92ed 100644
--- a/include/indicators/terminal_size.hpp
+++ b/include/indicators/terminal_size.hpp
@@ -2,11 +2,12 @@
 #pragma once
 #include <utility>
 
-namespace indicators {
 
 #if defined(_MSC_VER)
 #include <windows.h>
 
+namespace indicators {
+
 static inline std::pair<size_t, size_t> terminal_size() {
   CONSOLE_SCREEN_BUFFER_INFO csbi;
   int columns, rows;
@@ -18,10 +19,15 @@ static inline std::pair<size_t, size_t> terminal_size() {
 
 size_t terminal_width() { return terminal_size().second; }
 
+} // namespace indicators
+
 #else
+
 #include <sys/ioctl.h> //ioctl() and TIOCGWINSZ
 #include <unistd.h>    // for STDOUT_FILENO
 
+namespace indicators {
+
 static inline std::pair<size_t, size_t> terminal_size() {
   struct winsize size;
   ioctl(STDOUT_FILENO, TIOCGWINSZ, &size);
@@ -29,6 +35,8 @@ static inline std::pair<size_t, size_t> terminal_size() {
 }
 
 static inline size_t terminal_width() { return terminal_size().second; }
+
+} // namespace indicators
+
 #endif
 
-} // namespace indicators
\ No newline at end of file