Merge pull request #66 from godbyk/bugfix/nested-namespace

Elevate #includes from being nested in the namespace.
This commit is contained in:
Pranav
2020-06-17 08:35:52 -05:00
committed by GitHub

View File

@@ -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