Imported Debian patch 0.5.4-1

[debian/efibootmgr] / src / lib / efi.c

diff --git a/src/lib/efi.c b/src/lib/efi.c
index 7dd2ab3aa5d8d2c1a48231cce526d9359aaf0759..a4ce5cfe21cdd6fe8ea942cd133f05dba025bddb 100644 (file)
--- a/src/lib/efi.c
+++ b/src/lib/efi.c
@@ -18,10 +18,6 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define _FILE_OFFSET_BITS 64
-
-typedef unsigned long long u64;       /* hack to allow include of ethtool.h */
-
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -37,8 +33,10 @@ typedef unsigned long long u64;       /* hack to allow include of ethtool.h */
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <linux/sockios.h>
+#include <linux/types.h>
 #include <net/if.h>
 #include <pci/pci.h>
+#include <asm/types.h>
 #include <linux/ethtool.h>
 #include "efi.h"
 #include "efichar.h"
@@ -724,7 +722,7 @@ append_extra_args_file(void *data, unsigned long maxchars)
 
        if (fd == -1) {
                perror("Failed to open extra arguments file");
-               return 0;
+               exit(1);
        }
 
        do {