1 --- openscap-0.9.7/src/OVAL/probes/unix/solaris/isainfo.c.~1~	2013-04-23 06:21:51.478000001 -0700

     2 +++ openscap-0.9.7/src/OVAL/probes/unix/solaris/isainfo.c	2013-09-10 11:06:13.488839049 -0700

     3 @@ -47,6 +47,7 @@

     4  #include <arpa/inet.h>

     5  #include <regex.h>

     6  #include <sys/systeminfo.h>

     7 +#include "../../../../common/debug_priv.h"

     8  

     9  /* man sysinfo (2) recommends using 257 for this size */

    10  #define MAX_STR_RESULT 257

    11 @@ -92,8 +93,12 @@

    12  	if (sysinfo(SI_ARCHITECTURE_K, result.kernel_isa, MAX_STR_RESULT) == -1) {

    13  		return err;

    14  	}

    15 -

    16 +#if defined(__SVR4) && defined(__sun)

    17 +	if ((sysinfo(SI_ARCHITECTURE_32, result.application_isa, MAX_STR_RESULT) == -1) &&

    18 +	   (sysinfo(SI_ARCHITECTURE_64, result.application_isa, MAX_STR_RESULT) == -1)) {

    19 +#else

    20  	if (sysinfo(SI_ARCHITECTURE_NATIVE, result.application_isa, MAX_STR_RESULT) == -1) {

    21 +#endif

    22  		return err;

    23  	}

    24