Merge pull request #1115 from redhatrises/update_os_defined

Update OS_defines to use oscap_platforms.h

Author: matejak

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,9 +32,12 @@
 
 #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
 # if defined(__SVR4) || defined(__svr4__)
 #  define OS_SOLARIS
 # else
@@ -46,9 +49,11 @@
 # 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)
+# define OS_HPUX
 #else
 # error "Sorry, your OS isn't supported."
 #endif

src/CVSS/cvss.c

@@ -59,7 +59,7 @@
  *
  * raising a "Initializer must be a valid constant expression" compiler error.
  */
-#if defined(_AIX)
+#if defined(OS_AIX)
 #define NAN_INIT (0.0f/0.0f)
 
 #else  /* Platforms with non broken NAN */

src/DS/sds.c

@@ -55,7 +55,7 @@
 
 #include <string.h>
 #include <fcntl.h>
-#ifdef _WIN32
+#ifdef OS_WINDOWS
 #include <io.h>
 #else
 #include <unistd.h>
@@ -187,7 +187,7 @@ static int ds_sds_dump_component_sce(const xmlNode *script_node, const char *com
 		}
 		// TODO: error checking, fprintf should return strlen((const char*)text_contents)
 		fprintf(output_file, "%s", text_contents ? (char*)text_contents : "");
-#ifndef _WIN32
+#ifndef OS_WINDOWS
 		// NB: This code is for SCE scripts
 		if (fchmod(fd, 0700) != 0) {
 			oscap_seterr(OSCAP_EFAMILY_XML, "Failed to set executable permission on script (id='%s') that was split to '%s'.", component_id, filename);

src/OVAL/fts_sun.c

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#if defined (__SVR4) && defined (__sun)
+#if defined (OS_SOLARIS)
 
 #include <config.h>
 
@@ -57,7 +57,7 @@ static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
 #define	ALIGN(p)	(((unsigned long int) (p) + ALIGNBYTES) & ~ALIGNBYTES)
 #endif
 
-#if defined (__SVR4)
+#if defined (OS_SOLARIS)
 #define	USHRT_MAX	65535		/* max of "unsigned short int" */
 #define __set_errno(val) (errno = (val))
 #define __fchdir fchdir
@@ -1023,7 +1023,7 @@ fts_alloc(sp, name, namelen)
 	p->fts_instr = FTS_NOINSTR;
 	p->fts_number = 0;
 	p->fts_pointer = NULL;
-#if	defined(__SVR4) && defined(__sun)
+#if defined(OS_SOLARIS)
 	if (!ISSET(FTS_NOSTAT))
 		p->fts_statp->st_fstype[0] = '\0';
 #endif

src/OVAL/fts_sun.h

@@ -50,14 +50,14 @@
 # define __END_DECLS
 #endif
 
-#if defined(hpux)
+#if defined(OS_HPUX)
 # define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
 # define	_INCLUDE_POSIX_SOURCE
 # define	_LARGEFILE64_SOURCE
 #endif
 
 /* This needs to be ifdef SOLARIS */
-#if defined(__SVR4)
+#if defined(OS_SOLARIS)
 # define _D_EXACT_NAMLEN(d) (strlen((d)->d_name))
 # ifndef	_INCLUDE_POSIX_SOURCE
 # define	_INCLUDE_POSIX_SOURCE
@@ -249,8 +249,8 @@ __END_DECLS
 
 #endif /* fts.h */
 #else
-#if defined(__SVR4) && defined(__sun)
+#if defined(OS_SOLARIS)
 #include <fts.h>
-#endif /* defined(__SVR4) && defined(__sun) */ 
+#endif /* defined(OS_SOLARIS) */ 
 
 #endif /* HAVE_FTS_OPEN */

src/OVAL/oval_generator.c

@@ -34,7 +34,7 @@
 #include <stdlib.h>
 #include <time.h>
 
-#ifndef _WIN32
+#ifndef OS_WINDOWS
 #include <sys/time.h>
 #endif
 

src/OVAL/oval_probe.c

@@ -48,7 +48,7 @@
 #include "oval_probe_ext.h"
 #include "collectVarRefs_impl.h"
 
-#ifdef _WIN32
+#ifdef OS_WINDOWS
 #define X_OK 0
 #endif
 

src/OVAL/oval_probe_ext.c

@@ -30,7 +30,7 @@
 #include <limits.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef _WIN32
+#ifdef OS_WINDOWS
 #include <io.h>
 #else
 #include <unistd.h>
@@ -1021,7 +1021,7 @@ int oval_probe_ext_reset(SEAP_CTX_t *ctx, oval_pd_t *pd, oval_pext_t *pext)
 #include "SEAP/_seap-types.h"
 #include "SEAP/seap-descriptor.h"
 
-#ifdef _WIN32
+#ifdef OS_WINDOWS
 
 int oval_probe_ext_abort(SEAP_CTX_t *ctx, oval_pd_t *pd, oval_pext_t *pext)
 {

src/OVAL/oval_session.c

@@ -24,13 +24,13 @@
 #include <config.h>
 #endif
 
-#ifdef _WIN32
+#ifdef OS_WINDOWS
 #include <io.h>
 #else
 #include <unistd.h>
 #endif
 #include <string.h>
-#if defined(__linux__)
+#if defined(OS_LINUX)
 #include <linux/limits.h>
 #endif