• M
    Make sure sys/types.h is included after sys/sysmacros.h · f3f15cc2
    Michal Privoznik 提交于
    In the latest glibc, major() and minor() functions are marked as
    deprecated (glibc commit dbab6577):
    
      CC       util/libvirt_util_la-vircgroup.lo
    util/vircgroup.c: In function 'virCgroupGetBlockDevString':
    util/vircgroup.c:768:5: error: '__major_from_sys_types' is deprecated:
      In the GNU C Library, `major' is defined by <sys/sysmacros.h>.
      For historical compatibility, it is currently defined by
      <sys/types.h> as well, but we plan to remove this soon.
      To use `major', include <sys/sysmacros.h> directly.
      If you did not intend to use a system-defined macro `major',
      you should #undef it after including <sys/types.h>.
      [-Werror=deprecated-declarations]
         if (virAsprintf(&ret, "%d:%d ", major(sb.st_rdev), minor(sb.st_rdev)) < 0)
         ^~
    In file included from /usr/include/features.h:397:0,
                     from /usr/include/bits/libc-header-start.h:33,
                     from /usr/include/stdio.h:28,
                     from ../gnulib/lib/stdio.h:43,
                     from util/vircgroup.c:26:
    /usr/include/sys/sysmacros.h:87:1: note: declared here
     __SYSMACROS_DEFINE_MAJOR (__SYSMACROS_FST_IMPL_TEMPL)
     ^
    
    Moreover, in the glibc commit, there's suggestion to keep
    ordering of including of header files as implemented here.
    Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
    f3f15cc2
lxc_driver.c 165.9 KB