[tip:tools/kvm] kvm tools: prevent the redefined error

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Commit-ID:  604515a0472d2dab70b5d6841421f3cc02dead5d
Gitweb:     http://git.kernel.org/tip/604515a0472d2dab70b5d6841421f3cc02dead5d
Author:     Wanlong Gao <wanlong.gao@xxxxxxxxx>
AuthorDate: Sat, 17 Dec 2011 20:17:19 +0800
Committer:  Pekka Enberg <penberg@xxxxxxxxxx>
CommitDate: Sun, 18 Dec 2011 12:00:09 +0200

kvm tools: prevent the redefined error

In file included from ../../include/linux/stddef.h:4:0,
                 from ../../include/linux/list.h:5,
                 from include/kvm/framebuffer.h:5,
                 from builtin-run.c:8:
include/linux/compiler.h:8:0: error: "__attribute_const__" redefined [-Werror]
/usr/include/sys/cdefs.h:226:0: note: this is the location of the previous definition
cc1: all warnings being treated as errors

make: *** [builtin-run.o] Error 1

Signed-off-by: Wanlong Gao <gaowanlong@xxxxxxxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
---
 tools/kvm/include/linux/compiler.h |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/tools/kvm/include/linux/compiler.h b/tools/kvm/include/linux/compiler.h
index bd360c2..b9c5346 100644
--- a/tools/kvm/include/linux/compiler.h
+++ b/tools/kvm/include/linux/compiler.h
@@ -5,7 +5,10 @@
 #define __always_inline	inline
 #endif
 #define __user
+
+#ifndef __attribute_const__
 #define __attribute_const__
+#endif
 
 #define __used		__attribute__((__unused__))
 #define __iomem
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Stable Commits]     [Linux Stable Kernel]     [Linux Kernel]     [Linux USB Devel]     [Linux Video &Media]     [Linux Audio Users]     [Yosemite News]     [Linux SCSI]

  Powered by Linux