From: tsutsumi <>
Date: Tue, 16 Sep 2003 13:46:49 +0000 (+0000)
Subject: add missing quad_t condition
X-Git-Tag: rel-0-6~9
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dc279ac38ce7521d6fc9e037f8f4462a5823b99d;p=ccunit%2Fccunit.git

add missing quad_t condition
add prefix to config macros
---

diff --git a/src/ccunit/CCUnitAssert.h b/src/ccunit/CCUnitAssert.h
index bb507ea..b564baa 100644
--- a/src/ccunit/CCUnitAssert.h
+++ b/src/ccunit/CCUnitAssert.h
@@ -28,7 +28,7 @@
 #define CCUNITASSERT_H
 
 #include <ccunit/CCUnitConfig.h>
-#if HAVE_SYS_TYPES_H
+#if CCUNIT_HAVE_SYS_TYPES_H
 #  include <sys/types.h>
 #endif
 
@@ -57,18 +57,35 @@
 extern void ccunit_assert (const char* file, unsigned int line,
 			   bool condition, const char* condstr);
 
-#ifndef HAVE_U_CHAR
+#ifndef CCUNIT_HAVE_U_CHAR
 typedef unsigned char u_char;			/**< u_char */
 #endif
-#ifndef HAVE_U_INT
+#ifndef CCUNIT_HAVE_U_INT
 typedef unsigned int u_int;			/**< u_int */
 #endif
-#ifndef HAVE_U_SHORT
+#ifndef CCUNIT_HAVE_U_SHORT
 typedef unsigned short u_short;			/**< u_short */
 #endif
-#ifndef HAVE_U_LONG
+#ifndef CCUNIT_HAVE_U_LONG
 typedef unsigned long u_long;			/**< u_long */
 #endif
+#if CCUNIT_HAVE_QUAD_T
+#elif CCUNIT_HAVE_INT64_T
+typedef int64_t quad_t;				/**< quad_t */
+#define CCUNIT_HAVE_QUAD_T 1
+#elif CCUNIT_HAVE_LONG_LONG
+typedef long long quad_t;			/**< u_quad_t */
+#define CCUNIT_HAVE_QUAD_T 1
+#endif	/* CCUNIT_HAVE_QUAD_T */
+
+#if CCUNIT_HAVE_U_QUAD_T
+#elif CCUNIT_HAVE_U_INT64_T
+typedef u_int64_t u_quad_t;
+#define CCUNIT_HAVE_U_QUAD_T 1
+#elif CCUNIT_HAVE_LONG_LONG
+typedef unsigned long long u_quad_t;
+#define CCUNIT_HAVE_U_QUAD_T 1
+#endif	/* CCUNIT_HAVE_U_QUAD_T */
 
 typedef const char* _ccunit_str_t;		/**< string type */
 typedef const void* _ccunit_ptr_t;		/**< pointer type */
@@ -100,10 +117,10 @@ DCL_CCUNIT_ASSERT_TEST_TYPE(float);
 DCL_CCUNIT_ASSERT_TEST_TYPE(double);
 DCL_CCUNIT_ASSERT_TEST_TYPE(_ccunit_str_t);
 DCL_CCUNIT_ASSERT_TEST_TYPE(_ccunit_ptr_t);
-#if HAVE_QUAD_T
+#if CCUNIT_HAVE_QUAD_T
 DCL_CCUNIT_ASSERT_TEST_TYPE(quad_t);
 #endif
-#if HAVE_U_QUAD_T
+#if CCUNIT_HAVE_U_QUAD_T
 DCL_CCUNIT_ASSERT_TEST_TYPE(u_quad_t);
 #endif
 
@@ -158,11 +175,11 @@ DCL_CCUNIT_ASSERT_TEST_TYPE(u_quad_t);
   CCUNIT_ASSERT_TEST (double, EXPECT, OP, ACTUAL)
 #define CCUNIT_ASSERT_TEST_FLOAT(EXPECT, OP, ACTUAL)		\
   CCUNIT_ASSERT_TEST (float, EXPECT, OP, ACTUAL)
-#if HAVE_QUAD_T
+#if CCUNIT_HAVE_QUAD_T
 #define CCUNIT_ASSERT_TEST_QUAD(EXPECT, OP, ACTUAL)		\
   CCUNIT_ASSERT_TEST (quad_t, EXPECT, OP, ACTUAL)
 #endif
-#if HAVE_U_QUAD_T
+#if CCUNIT_HAVE_U_QUAD_T
 #define CCUNIT_ASSERT_TEST_UQUAD(EXPECT, OP, ACTUAL)		\
   CCUNIT_ASSERT_TEST (u_quad_t, EXPECT, OP, ACTUAL)
 #endif
@@ -215,7 +232,7 @@ DCL_CCUNIT_ASSERT_TEST_TYPE(u_quad_t);
 #define CCUNIT_ASSERT_GE_UINT(EXPECT, ACTUAL)	\
   CCUNIT_ASSERT_TEST_UINT (EXPECT, >=, ACTUAL)
 
-#if HAVE_QUAD_T
+#if CCUNIT_HAVE_QUAD_T
 #define CCUNIT_ASSERT_EQ_QUAD(EXPECT, ACTUAL)	\
   CCUNIT_ASSERT_TEST_QUAD (EXPECT, ==, ACTUAL)
 #define CCUNIT_ASSERT_NE_QUAD(EXPECT, ACTUAL)	\
@@ -230,7 +247,7 @@ DCL_CCUNIT_ASSERT_TEST_TYPE(u_quad_t);
   CCUNIT_ASSERT_TEST_QUAD (EXPECT, >=, ACTUAL)
 #endif
 
-#if HAVE_U_QUAD_T
+#if CCUNIT_HAVE_U_QUAD_T
 #define CCUNIT_ASSERT_EQ_UQUAD(EXPECT, ACTUAL)	\
   CCUNIT_ASSERT_TEST_UQUAD (EXPECT, ==, ACTUAL)
 #define CCUNIT_ASSERT_NE_UQUAD(EXPECT, ACTUAL)	\