From 1b526e64f713ee3d5e3b34cb40373f8e59c8318c Mon Sep 17 00:00:00 2001 From: Minwoo Im Date: Tue, 3 Sep 2019 10:25:37 +0900 Subject: [PATCH] remove LIBUUID things from nvme.h MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We have this structure in linux/nvme.h already. cc -D_GNU_SOURCE -D__CHECK_ENDIAN__ -O2 -g -Wall -Werror -std=gnu99 -I. -DNVME_VERSION='"1.9.22.g6936.dirty"' -Iutil -o nvme-print.o -c nvme-print.c In file included from nvme.h:35:0, from nvme-print.h:4, from nvme-print.c:7: linux/nvme.h:24:3: error: conflicting types for ‘uuid_t’ } uuid_t; ^~~~~~ In file included from nvme-print.h:4:0, from nvme-print.c:7: nvme.h:32:3: note: previous declaration of ‘uuid_t’ was here } uuid_t; ^~~~~~ Makefile:70: recipe for target 'nvme-print.o' failed Signed-off-by: Minwoo Im --- nvme.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/nvme.h b/nvme.h index 2564e760..6d745b66 100644 --- a/nvme.h +++ b/nvme.h @@ -24,14 +24,6 @@ #define unlikely(x) x -#ifdef LIBUUID -#include -#else -typedef struct { - uint8_t b[16]; -} uuid_t; -#endif - #include "linux/nvme.h" struct nvme_effects_log_page { -- 2.50.1