mirror of
				https://github.com/rad4day/Waybar.git
				synced 2025-11-04 09:42:42 +01:00 
			
		
		
		
	Battery: replace #else by #elif defined(__linux__)
Cannot use #else here when inotify_init1() is hidden behind #if defined(__Linux__). Co-authored-by: Jan Beich <jbeich@FreeBSD.org>
This commit is contained in:
		
				
					committed by
					
						
						Loïc Bartoletti
					
				
			
			
				
	
			
			
			
						parent
						
							0ada5ac8b0
						
					
				
				
					commit
					a58988ea9d
				
			@@ -226,7 +226,7 @@ const std::tuple<uint8_t, float, std::string, float> waybar::modules::Battery::g
 | 
				
			|||||||
    //spdlog::info("{} {} {} {}", capacity,time,status,rate);
 | 
					    //spdlog::info("{} {} {} {}", capacity,time,status,rate);
 | 
				
			||||||
    return {capacity, time, status, rate};
 | 
					    return {capacity, time, status, rate};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#else
 | 
					#elif defined(__linux__)
 | 
				
			||||||
    uint32_t total_power = 0;   // μW
 | 
					    uint32_t total_power = 0;   // μW
 | 
				
			||||||
>>>>>>> 246e377 (FreeBSD: Add support to battery)
 | 
					>>>>>>> 246e377 (FreeBSD: Add support to battery)
 | 
				
			||||||
    uint32_t total_energy = 0;  // μWh
 | 
					    uint32_t total_energy = 0;  // μWh
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user