From 45e44e03bd768dcad23309ee4b7d213f6db7332b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Bartoletti?= <loic.bartoletti@oslandia.com>
Date: Tue, 4 Oct 2022 06:12:42 +0200
Subject: [PATCH] Apply jbeich suggestion for if defined(__linux__)

---
 include/modules/battery.hpp |  2 ++
 src/modules/battery.cpp     | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/include/modules/battery.hpp b/include/modules/battery.hpp
index 5f25fd5..42cf164 100644
--- a/include/modules/battery.hpp
+++ b/include/modules/battery.hpp
@@ -6,7 +6,9 @@
 #include <filesystem>
 #endif
 #include <fmt/format.h>
+#if #defined(__linux__)
 #include <sys/inotify.h>
+#endif
 
 #include <algorithm>
 #include <fstream>
diff --git a/src/modules/battery.cpp b/src/modules/battery.cpp
index 1fbdcb5..13a4920 100644
--- a/src/modules/battery.cpp
+++ b/src/modules/battery.cpp
@@ -31,7 +31,7 @@ waybar::modules::Battery::Battery(const std::string& id, const Json::Value& conf
 }
 
 waybar::modules::Battery::~Battery() {
-#if (__Linux__)
+#if defined(__linux__)
   std::lock_guard<std::mutex> guard(battery_list_mutex_);
 
   if (global_watch >= 0) {
@@ -87,7 +87,7 @@ void waybar::modules::Battery::worker() {
 }
 
 void waybar::modules::Battery::refreshBatteries() {
-#if (__Linux__)
+#if defined(__linux__)
   std::lock_guard<std::mutex> guard(battery_list_mutex_);
   // Mark existing list of batteries as not necessarily found
   std::map<fs::path, bool> check_map;
@@ -525,7 +525,7 @@ const std::tuple<uint8_t, float, std::string, float> waybar::modules::Battery::g
 }
 
 const std::string waybar::modules::Battery::getAdapterStatus(uint8_t capacity) const {
-#if defined(__Linux__)
+#if defined(__linux__)
   if (!adapter_.empty()) {
     bool online;
     std::string status;
@@ -546,7 +546,7 @@ const std::string waybar::modules::Battery::getAdapterStatus(uint8_t capacity) c
       return "Plugged";
     }
     return "Discharging";
-#if defined(__Linux__)
+#if defined(__linux__)
   }
 #endif
   return "Unknown";
@@ -570,7 +570,7 @@ const std::string waybar::modules::Battery::formatTimeRemaining(float hoursRemai
 }
 
 auto waybar::modules::Battery::update() -> void {
-#if __Linux__
+#if defined(__linux__)
   if (batteries_.empty()) {
     event_box_.hide();
     return;