Clean up oscap_platforms.h

Author: redhatrises

compat/compat.h

@@ -24,6 +24,7 @@
 #define OSCAP_COMPAT_H_
 
 #include "oscap_export.h"
+#include "oscap_platforms.h"
 
 /* Fallback functions fixing portability issues */
 
@@ -40,7 +41,7 @@ char *strptime(const char *buf, const char *format, struct tm *tm);
 #define OSCAP_UNIX
 #endif
 
-#ifdef _WIN32
+#ifdef OS_WINDOWS
 #define PATH_MAX _MAX_PATH
 #endif
 

compat/oscap_platforms.h

@@ -32,7 +32,9 @@
 
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 # define OS_FREEBSD
-#elif defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
+#elif defined(__linux__) && defined(__GLIBC__)
+# define OS_LINUX_WITH_GLIBC
+#elif defined(__linux__) || defined(OS_LINUX_WITH_GLIBC)
 # define OS_LINUX
 #elif defined(sun) || defined(__sun)
 # define OS_SUN
@@ -47,7 +49,7 @@
 # define OS_AIX
 #elif defined(__APPLE__)
 # define OS_APPLE
-# if defined(Macintosh) || defined(macintosh) || defined(__APPLE__) && defined(__MACH__)
+# if defined(Macintosh) || defined(macintosh) || defined(__MACH__) || defined(__APPLE__)
 #  define OS_OSX
 # endif
 #elif defined(_hpux) || defined(hpux) || defined(__hpux)