Changeset 4815

Show
Ignore:
Timestamp:
10/02/08 10:09:56 (2 months ago)
Author:
jmowery
Message:

merged sepol/errcodes.h change from trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/setools-devel/configure.ac

    r4805 r4815  
    663663dnl check for new error code format, added in libsepol 2.0.0 
    664664AC_CHECK_HEADER([sepol/errcodes.h], 
    665                 sepol_new_defines="yes", 
    666                 sepol_new_defines="no") 
     665                sepol_new_errcodes="yes", 
     666                sepol_new_errcodes="no") 
    667667 
    668668AC_RUN_IFELSE( 
    …… 
    908908AC_DEFINE_UNQUOTED(SECHECKER_VERSION, "${sechecker_version}", [sechecker version]) 
    909909 
    910 if test ${sepol_new_defines} != "yes" ; then 
     910if test ${sepol_new_errcodes} != "yes" ; then 
    911911   AC_DEFINE(SEPOL_ENOMEM, HASHTAB_OVERFLOW, [remap of libsepol 1.x.x define to 2.x.x]) 
    912912   AC_DEFINE(SEPOL_EEXIST, HASHTAB_PRESENT, [remap of libsepol 1.x.x define to 2.x.x]) 
     913else 
     914   AC_DEFINE(HAVE_SEPOL_ERRCODES, 1, [if libsepol has errcodes.h]) 
    913915fi 
    914916if test ${sepol_new_expand_boolmap} == "yes" ; then 

  • branches/setools-devel/libqpol/src/policy_define.c

    r4810 r4815  
    5858#include <sepol/policydb/polcaps.h> 
    5959#endif 
     60#ifdef HAVE_SEPOL_ERRCODES 
    6061#include <sepol/errcodes.h> 
     62#endif 
    6163 
    6264#include "queue.h" 

  • branches/setools-devel/libqpol/src/policy_extend.c

    r4810 r4815  
    3333#include <sepol/policydb/ebitmap.h> 
    3434#include <sepol/policydb/expand.h> 
     35#ifdef HAVE_SEPOL_ERRCODES 
    3536#include <sepol/errcodes.h> 
     37#endif 
    3638#include <qpol/policy.h> 
    3739#include <qpol/policy_extend.h>