From b961e99442ce7de6a1498946a47baa4a732b870b Mon Sep 17 00:00:00 2001 From: Lu Guanqun Date: Tue, 20 Aug 2013 14:45:15 +0800 Subject: rename ulong to ulong64 to avoid the conflicts in MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ 31%] Building CXX object utests/CMakeFiles/utests.dir/compiler_abs_diff.cpp.o /home/q/beignet.git/utests/compiler_abs_diff.cpp:201:18: error: conflicting declaration ‘typedef uint64_t ulong’ /usr/include/i386-linux-gnu/sys/types.h:151:27: error: ‘ulong’ has a previous declaration as ‘typedef long unsigned int ulong’ Signed-off-by: Lu Guanqun Reviewed-by: Zhigang Gong --- utests/compiler_abs_diff.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'utests/compiler_abs_diff.cpp') diff --git a/utests/compiler_abs_diff.cpp b/utests/compiler_abs_diff.cpp index f89d0010..71881b17 100644 --- a/utests/compiler_abs_diff.cpp +++ b/utests/compiler_abs_diff.cpp @@ -196,13 +196,13 @@ template static void compiler_abs_diff_with_type(void) typedef unsigned char uchar; typedef unsigned short ushort; typedef unsigned int uint; -typedef uint64_t ulong; +typedef uint64_t ulong64; ABS_TEST_DIFF_TYPE(int, uint) -ABS_TEST_DIFF_TYPE_2(int64_t, long, ulong) +ABS_TEST_DIFF_TYPE_2(int64_t, long, ulong64) ABS_TEST_DIFF_TYPE(short, ushort) ABS_TEST_DIFF_TYPE(char, uchar) ABS_TEST_DIFF_TYPE(uint, uint) -ABS_TEST_DIFF_TYPE(ulong, ulong) +ABS_TEST_DIFF_TYPE_2(ulong64, ulong, ulong64) ABS_TEST_DIFF_TYPE(ushort, ushort) ABS_TEST_DIFF_TYPE(uchar, uchar) -- cgit v1.2.1