[systemd-commits] src/execute.h

Kay Sievers kay at kemper.freedesktop.org
Fri Sep 3 03:39:39 PDT 2010


 src/execute.h |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit dacdf153675637258d155faa592b247837b05e42
Author: Kay Sievers <kay.sievers at vrfy.org>
Date:   Fri Sep 3 12:26:30 2010 +0200

    work around busted capability.h
    
    It contains things like:
      #ifndef _LINUX_TYPES_H
      #define _LINUX_TYPES_H
      #include <stdint.h>
      typedef uint32_t __u32;
      typedef __u32 __le32;
      ...
    
    which result in:
      /usr/include/asm-generic/int-ll64.h:30:42: error: conflicting types for ‘__u64’
      /usr/include/sys/capability.h:39:18: note: previous declaration of ‘__u64’ was here
      make[1]: *** [src/libsystemd_core_la-unit.lo] Error 1
      make[1]: Leaving directory `/home/kay/work/src/systemd'
      make: *** [all] Error 2
    
    So, include linux/types.h to get around that.

diff --git a/src/execute.h b/src/execute.h
index 31cce5d..b612145 100644
--- a/src/execute.h
+++ b/src/execute.h
@@ -26,6 +26,7 @@ typedef struct ExecStatus ExecStatus;
 typedef struct ExecCommand ExecCommand;
 typedef struct ExecContext ExecContext;
 
+#include <linux/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/capability.h>


More information about the systemd-commits mailing list