[ViewVC] Diff of: cvs/libecb/ecb.h

Comparing libecb/ecb.h (file contents):
Revision 1.32 by root, Wed Jun 1 01:02:31 2011 UTC vs.
Revision 1.58 by root, Wed Aug 3 15:40:18 2011 UTC

…		…
28	*/	28	*/
29		29
30	#ifndef ECB_H	30	#ifndef ECB_H
31	#define ECB_H	31	#define ECB_H
32		32
		33	#ifdef _WIN32
		34	typedef signed char int8_t;
		35	typedef unsigned char uint8_t;
		36	typedef signed short int16_t;
		37	typedef unsigned short uint16_t;
		38	typedef signed int int32_t;
		39	typedef unsigned int uint32_t;
		40	#if __GNUC__
		41	typedef signed long long int64_t;
		42	typedef unsigned long long uint64_t;
		43	#else /* _MSC_VER \|\| __BORLANDC__ */
		44	typedef signed __int64 int64_t;
		45	typedef unsigned __int64 uint64_t;
		46	#endif
		47	#else
33	#include <inttypes.h>	48	#include <inttypes.h>
		49	#endif
34		50
35	/* many compilers define _GNUC_ to some versions but then only implement	51	/* many compilers define _GNUC_ to some versions but then only implement
36	* what their idiot authors think are the "more important" extensions,	52	* what their idiot authors think are the "more important" extensions,
37	* causing enourmous grief in return for some better fake benchmark numbers.	53	* causing enourmous grief in return for some better fake benchmark numbers.
38	* or so.	54	* or so.
39	* we try to detect these and simply assume they are not gcc - if they have	55	* we try to detect these and simply assume they are not gcc - if they have
40	* an issue with that they should have done it right in the first place.	56	* an issue with that they should have done it right in the first place.
41	*/	57	*/
42	#ifndef ECB_GCC_VERSION	58	#ifndef ECB_GCC_VERSION
43	# if defined(__INTEL_COMPILER) \|\| defined(__SUNPRO_C) \|\| defined(__llvm__)	59	#if !defined(__GNUC_MINOR__) \|\| defined(__INTEL_COMPILER) \|\| defined(__SUNPRO_C) \|\| defined(__SUNPRO_CC) \|\| defined(__llvm__) \|\| defined(__clang__)
44	# define ECB_GCC_VERSION(major,minor) 0	60	#define ECB_GCC_VERSION(major,minor) 0
45	# else	61	#else
46	# define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) \|\| (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))	62	#define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) \|\| (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
		63	#endif
47	# endif	64	#endif
		65
		66	/*****************************************************************************/
		67
		68	/* ECB_NO_THREADS - ecb is not used by multiple threads, ever */
		69	/* ECB_NO_SMP - ecb might be used in multiple threads, but only on a single cpu */
		70
		71	#if ECB_NO_THREADS \|\| ECB_NO_SMP
		72	#define ECB_MEMORY_FENCE do { } while (0)
		73	#define ECB_MEMORY_FENCE_ACQUIRE do { } while (0)
		74	#define ECB_MEMORY_FENCE_RELEASE do { } while (0)
		75	#endif
		76
		77	#ifndef ECB_MEMORY_FENCE
		78	#if ECB_GCC_VERSION(2,5)
		79	#if __x86
		80	#define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
		81	#define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE /* non-lock xchg might be enough */
		82	#define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change in future cpus */
		83	#elif __amd64
		84	#define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
		85	#define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory")
		86	#define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") /* play safe - not needed in any current cpu */
		87	#endif
48	#endif	88	#endif
		89	#endif
49		90
		91	#ifndef ECB_MEMORY_FENCE
		92	#if ECB_GCC_VERSION(4,4)
		93	#define ECB_MEMORY_FENCE __sync_synchronize ()
		94	#define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); })
		95	#define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); })
		96	#elif _MSC_VER >= 1400 /* VC++ 2005 */
		97	#pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
		98	#define ECB_MEMORY_FENCE _ReadWriteBarrier ()
		99	#define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
		100	#define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
		101	#elif defined(_WIN32)
		102	#include <WinNT.h>
		103	#define ECB_MEMORY_FENCE MemoryBarrier () /* actually just xchg on x86... scary */
		104	#define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
		105	#define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
		106	#endif
		107	#endif
		108
		109	#ifndef ECB_MEMORY_FENCE
		110	/*
		111	* if you get undefined symbol references to pthread_mutex_lock,
		112	* or failure to find pthread.h, then you should implement
		113	* the ECB_MEMORY_FENCE operations for your cpu/compiler
		114	* OR proide pthread.h and link against the posix thread library
		115	* of your system.
		116	*/
		117	#include <pthread.h>
		118
		119	static pthread_mutex_t ecb_mf_lock = PTHREAD_MUTEX_INITIALIZER;
		120	#define ECB_MEMORY_FENCE do { pthread_mutex_lock (&ecb_mf_lock); pthread_mutex_unlock (&ecb_mf_lock); } while (0)
		121	#define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
		122	#define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
		123	#endif
		124
		125	/*****************************************************************************/
		126
		127	#define ECB_C99 (__STDC_VERSION__ >= 199901L)
		128
50	#ifndef __cplusplus	129	#if __cplusplus
51	# if __STDC_VERSION__ >= 199901L	130	#define ecb_inline static inline
52	# define ECB_INLINE inline	131	#elif ECB_GCC_VERSION(2,5)
53	typedef _Bool ecb_bool;	132	#define ecb_inline static __inline__
		133	#elif ECB_C99
		134	#define ecb_inline static inline
54	# else	135	#else
55	# define ECB_INLINE inline /* yeah! */	136	#define ecb_inline static
		137	#endif
		138
		139	#if ECB_GCC_VERSION(3,3)
		140	#define ecb_restrict __restrict__
		141	#elif ECB_C99
		142	#define ecb_restrict restrict
		143	#else
		144	#define ecb_restrict
		145	#endif
		146
56	typedef int ecb_bool;	147	typedef int ecb_bool;
57	# endif
58	#else
59	# define ECB_INLINE inline
60	typedef bool ecb_bool;
61	#endif
62		148
63	#define ECB_CONCAT_(a, b) a ## b	149	#define ECB_CONCAT_(a, b) a ## b
64	#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b)	150	#define ECB_CONCAT(a, b) ECB_CONCAT_(a, b)
65	#define ECB_STRINGIFY_(a) # a	151	#define ECB_STRINGIFY_(a) # a
66	#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a)	152	#define ECB_STRINGIFY(a) ECB_STRINGIFY_(a)
67		153
68	#define ECB_HEADER_INLINE static ECB_INLINE	154	#define ecb_function_ ecb_inline
69		155
70	#if ECB_GCC_VERSION(3,1)	156	#if ECB_GCC_VERSION(3,1)
71	# define ecb_attribute(attrlist) __attribute__(attrlist)	157	#define ecb_attribute(attrlist) __attribute__(attrlist)
72	# define ecb_is_constant(expr) __builtin_constant_p (expr)	158	#define ecb_is_constant(expr) __builtin_constant_p (expr)
73	# define ecb_expect(expr,value) __builtin_expect ((expr),(value))	159	#define ecb_expect(expr,value) __builtin_expect ((expr),(value))
74	# define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)	160	#define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
75	#else	161	#else
76	# define ecb_attribute(attrlist)	162	#define ecb_attribute(attrlist)
77	# define ecb_is_constant(expr) 0	163	#define ecb_is_constant(expr) 0
78	# define ecb_expect(expr,value) (expr)	164	#define ecb_expect(expr,value) (expr)
79	# define ecb_prefetch(addr,rw,locality)	165	#define ecb_prefetch(addr,rw,locality)
80	#endif	166	#endif
81		167
82	/* no emulation for ecb_decltype */	168	/* no emulation for ecb_decltype */
83	#if ECB_GCC_VERSION(4,5)	169	#if ECB_GCC_VERSION(4,5)
84	# define ecb_decltype(x) __decltype(x)	170	#define ecb_decltype(x) __decltype(x)
85	#elif ECB_GCC_VERSION(3,0)	171	#elif ECB_GCC_VERSION(3,0)
86	# define ecb_decltype(x) typeof(x)	172	#define ecb_decltype(x) __typeof(x)
87	#endif	173	#endif
88		174
89	#define ecb_artificial ecb_attribute ((__artificial__)) /* 4.3 */
90	#define ecb_noinline ecb_attribute ((__noinline__))	175	#define ecb_noinline ecb_attribute ((__noinline__))
91	#define ecb_noreturn ecb_attribute ((__noreturn__))	176	#define ecb_noreturn ecb_attribute ((__noreturn__))
92	#define ecb_unused ecb_attribute ((__unused__))	177	#define ecb_unused ecb_attribute ((__unused__))
93	#define ecb_const ecb_attribute ((__const__))	178	#define ecb_const ecb_attribute ((__const__))
94	#define ecb_pure ecb_attribute ((__pure__))	179	#define ecb_pure ecb_attribute ((__pure__))
		180
		181	#if ECB_GCC_VERSION(4,3)
		182	#define ecb_artificial ecb_attribute ((__artificial__))
95	#define ecb_hot ecb_attribute ((__hot__)) /* 4.3 */	183	#define ecb_hot ecb_attribute ((__hot__))
96	#define ecb_cold ecb_attribute ((__cold__)) /* 4.3 */	184	#define ecb_cold ecb_attribute ((__cold__))
		185	#else
		186	#define ecb_artificial
		187	#define ecb_hot
		188	#define ecb_cold
		189	#endif
97		190
98	/* put into if's if you are very sure that the expression */	191	/* put around conditional expressions if you are very sure that the */
99	/* is mostly true or mosty false. note that these return */	192	/* expression is mostly true or mostly false. note that these return */
100	/* booleans, not the expression. */	193	/* booleans, not the expression. */
101	#define ecb_unlikely(expr) ecb_expect (!!(expr), 0)	194	#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
		195	#define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
		196	/* for compatibility to the rest of the world */
102	#define ecb_likely(expr) ecb_expect (!!(expr), 1)	197	#define ecb_likely(expr) ecb_expect_true (expr)
		198	#define ecb_unlikely(expr) ecb_expect_false (expr)
		199
		200	/* count trailing zero bits and count # of one bits */
		201	#if ECB_GCC_VERSION(3,4)
		202	/* we assume int == 32 bit, long == 32 or 64 bit and long long == 64 bit */
		203	#define ecb_ld32(x) (__builtin_clz (x) ^ 31)
		204	#define ecb_ld64(x) (__builtin_clzll (x) ^ 63)
		205	#define ecb_ctz32(x) __builtin_ctz (x)
		206	#define ecb_ctz64(x) __builtin_ctzll (x)
		207	#define ecb_popcount32(x) __builtin_popcount (x)
		208	/* no popcountll */
		209	#else
		210	ecb_function_ int ecb_ctz32 (uint32_t x) ecb_const;
		211	ecb_function_ int
		212	ecb_ctz32 (uint32_t x)
		213	{
		214	int r = 0;
		215
		216	x &= ~x + 1; /* this isolates the lowest bit */
		217
		218	#if ECB_branchless_on_i386
		219	r += !!(x & 0xaaaaaaaa) << 0;
		220	r += !!(x & 0xcccccccc) << 1;
		221	r += !!(x & 0xf0f0f0f0) << 2;
		222	r += !!(x & 0xff00ff00) << 3;
		223	r += !!(x & 0xffff0000) << 4;
		224	#else
		225	if (x & 0xaaaaaaaa) r += 1;
		226	if (x & 0xcccccccc) r += 2;
		227	if (x & 0xf0f0f0f0) r += 4;
		228	if (x & 0xff00ff00) r += 8;
		229	if (x & 0xffff0000) r += 16;
		230	#endif
		231
		232	return r;
		233	}
		234
		235	ecb_function_ int ecb_ctz64 (uint64_t x) ecb_const;
		236	ecb_function_ int
		237	ecb_ctz64 (uint64_t x)
		238	{
		239	int shift = x & 0xffffffffU ? 0 : 32;
		240	return ecb_ctz32 (x >> shift) + shift;
		241	}
		242
		243	ecb_function_ int ecb_popcount32 (uint32_t x) ecb_const;
		244	ecb_function_ int
		245	ecb_popcount32 (uint32_t x)
		246	{
		247	x -= (x >> 1) & 0x55555555;
		248	x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
		249	x = ((x >> 4) + x) & 0x0f0f0f0f;
		250	x *= 0x01010101;
		251
		252	return x >> 24;
		253	}
		254
		255	ecb_function_ int ecb_ld32 (uint32_t x) ecb_const;
		256	ecb_function_ int ecb_ld32 (uint32_t x)
		257	{
		258	int r = 0;
		259
		260	if (x >> 16) { x >>= 16; r += 16; }
		261	if (x >> 8) { x >>= 8; r += 8; }
		262	if (x >> 4) { x >>= 4; r += 4; }
		263	if (x >> 2) { x >>= 2; r += 2; }
		264	if (x >> 1) { r += 1; }
		265
		266	return r;
		267	}
		268
		269	ecb_function_ int ecb_ld64 (uint64_t x) ecb_const;
		270	ecb_function_ int ecb_ld64 (uint64_t x)
		271	{
		272	int r = 0;
		273
		274	if (x >> 32) { x >>= 32; r += 32; }
		275
		276	return r + ecb_ld32 (x);
		277	}
		278	#endif
		279
		280	/* popcount64 is only available on 64 bit cpus as gcc builtin */
		281	/* so for this version we are lazy */
		282	ecb_function_ int ecb_popcount64 (uint64_t x) ecb_const;
		283	ecb_function_ int
		284	ecb_popcount64 (uint64_t x)
		285	{
		286	return ecb_popcount32 (x) + ecb_popcount32 (x >> 32);
		287	}
		288
		289	ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) ecb_const;
		290	ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) ecb_const;
		291	ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) ecb_const;
		292	ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) ecb_const;
		293	ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) ecb_const;
		294	ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const;
		295	ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) ecb_const;
		296	ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) ecb_const;
		297
		298	ecb_inline uint8_t ecb_rotl8 (uint8_t x, unsigned int count) { return (x >> ( 8 - count)) \| (x << count); }
		299	ecb_inline uint8_t ecb_rotr8 (uint8_t x, unsigned int count) { return (x << ( 8 - count)) \| (x >> count); }
		300	ecb_inline uint16_t ecb_rotl16 (uint16_t x, unsigned int count) { return (x >> (16 - count)) \| (x << count); }
		301	ecb_inline uint16_t ecb_rotr16 (uint16_t x, unsigned int count) { return (x << (16 - count)) \| (x >> count); }
		302	ecb_inline uint32_t ecb_rotl32 (uint32_t x, unsigned int count) { return (x >> (32 - count)) \| (x << count); }
		303	ecb_inline uint32_t ecb_rotr32 (uint32_t x, unsigned int count) { return (x << (32 - count)) \| (x >> count); }
		304	ecb_inline uint64_t ecb_rotl64 (uint64_t x, unsigned int count) { return (x >> (64 - count)) \| (x << count); }
		305	ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (64 - count)) \| (x >> count); }
		306
		307	#if ECB_GCC_VERSION(4,3)
		308	#define ecb_bswap16(x) (__builtin_bswap32 (x) >> 16)
		309	#define ecb_bswap32(x) __builtin_bswap32 (x)
		310	#define ecb_bswap64(x) __builtin_bswap64 (x)
		311	#else
		312	ecb_function_ uint16_t ecb_bswap16 (uint16_t x) ecb_const;
		313	ecb_function_ uint16_t
		314	ecb_bswap16 (uint16_t x)
		315	{
		316	return ecb_rotl16 (x, 8);
		317	}
		318
		319	ecb_function_ uint32_t ecb_bswap32 (uint32_t x) ecb_const;
		320	ecb_function_ uint32_t
		321	ecb_bswap32 (uint32_t x)
		322	{
		323	return (((uint32_t)ecb_bswap16 (x)) << 16) \| ecb_bswap16 (x >> 16);
		324	}
		325
		326	ecb_function_ uint64_t ecb_bswap64 (uint64_t x) ecb_const;
		327	ecb_function_ uint64_t
		328	ecb_bswap64 (uint64_t x)
		329	{
		330	return (((uint64_t)ecb_bswap32 (x)) << 32) \| ecb_bswap32 (x >> 32);
		331	}
		332	#endif
		333
		334	#if ECB_GCC_VERSION(4,5)
		335	#define ecb_unreachable() __builtin_unreachable ()
		336	#else
		337	/* this seems to work fine, but gcc always emits a warning for it :/ */
		338	ecb_function_ void ecb_unreachable (void) ecb_noreturn;
		339	ecb_function_ void ecb_unreachable (void) { }
		340	#endif
103		341
104	/* try to tell the compiler that some condition is definitely true */	342	/* try to tell the compiler that some condition is definitely true */
105	#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0)	343	#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0)
106		344
107	/* count trailing zero bits and count # of one bits */
108	#if ECB_GCC_VERSION(3,4)
109	#define ecb_ctz32(x) __builtin_ctz (x)
110	#define ecb_popcount32(x) __builtin_popcount (x)
111	#else
112	ECB_HEADER_INLINE int ecb_ctz32 (uint32_t x) ecb_const;
113	ECB_HEADER_INLINE
114	ecb_ctz32 (uint32_t x)
115	{
116	int r = 0;
117
118	x &= -x; /* this isolates the lowest bit */
119
120	if (x & 0xaaaaaaaa) r += 1;
121	if (x & 0xcccccccc) r += 2;
122	if (x & 0xf0f0f0f0) r += 4;
123	if (x & 0xff00ff00) r += 8;
124	if (x & 0xffff0000) r += 16;
125
126	return r;
127	}
128
129	ECB_HEADER_INLINE int ecb_popcount32 (uint32_t x) ecb_const;
130	ECB_HEADER_INLINE
131	ecb_popcount32 (uint32_t x)
132	{
133	x -= (x >> 1) & 0x55555555;
134	x = ((x >> 2) & 0x33333333) + (x & 0x33333333);
135	x = ((x >> 4) + x) & 0x0f0f0f0f;
136	x *= 0x01010101;
137
138	return x >> 24;
139	}
140	#endif
141
142	#if ECB_GCC_VERSION(4,3)
143	# define ecb_bswap32(x) __builtin_bswap32 (x)
144	# define ecb_bswap16(x) (__builtin_bswap32(x) >> 16)
145	#else
146	ECB_HEADER_INLINE uint32_t ecb_bswap32 (uint32_t x) ecb_const;
147	ECB_HEADER_INLINE uint32_t
148	ecb_bswap32 (uint32_t x)
149	{
150	return (x >> 24)
151	\| ((x >> 8) & 0x0000ff00)
152	\| ((x << 8) & 0x00ff0000)
153	\| (x << 24);
154	}
155
156	ECB_HEADER_INLINE uint32_t ecb_bswap16 (uint32_t x) ecb_const;
157	ECB_HEADER_INLINE uint32_t
158	ecb_bswap16 (uint32_t x)
159	{
160	return ((x >> 8) & 0xff)
161	\| ((x << 8) & 0x00ff0000)
162	\| (x << 24);
163	}
164	#endif
165
166	#if ECB_GCC_VERSION(4,5)
167	# define ecb_unreachable() __builtin_unreachable ()
168	#else
169	/* this seems to work fine, but gcc always emits a warning for it :/ */
170	ECB_HEADER_INLINE void ecb_unreachable (void) ecb_noreturn;
171	ECB_HEADER_INLINE void ecb_unreachable (void) { }
172	#endif
173
174	ECB_HEADER_INLINE unsigned char ecb_byteorder_helper (void) ecb_const;	345	ecb_function_ unsigned char ecb_byteorder_helper (void) ecb_const;
175	ECB_HEADER_INLINE unsigned char	346	ecb_function_ unsigned char
176	ecb_byteorder_helper (void)	347	ecb_byteorder_helper (void)
177	{	348	{
178	const uint32_t u = 0x11223344;	349	const uint32_t u = 0x11223344;
179	return (unsigned char )&u;	350	return (unsigned char )&u;
180	}	351	}
181		352
182	ECB_HEADER_INLINE ecb_bool ecb_big_endian (void) ecb_const;	353	ecb_function_ ecb_bool ecb_big_endian (void) ecb_const;
183	ECB_HEADER_INLINE ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; };	354	ecb_function_ ecb_bool ecb_big_endian (void) { return ecb_byteorder_helper () == 0x11; }
184	ECB_HEADER_INLINE ecb_bool ecb_little_endian (void) ecb_const;	355	ecb_function_ ecb_bool ecb_little_endian (void) ecb_const;
185	ECB_HEADER_INLINE ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; };	356	ecb_function_ ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; }
186		357
187	#if ECB_GCC_VERSION(3,0)	358	#if ECB_GCC_VERSION(3,0) \|\| ECB_C99
188	# define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))	359	#define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
189	#else	360	#else
190	# define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))	361	#define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
191	#endif	362	#endif
192		363
193	#if ecb_cplusplus_does_not_suck	364	#if ecb_cplusplus_does_not_suck
194	// does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm)	365	/* does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm) */
195	template<typename T, int N>	366	template<typename T, int N>
196	static inline int ecb_array_length (const T (&arr)[N])	367	static inline int ecb_array_length (const T (&arr)[N])
197	{	368	{
198	return N;	369	return N;
199	}	370	}
200	#else	371	#else
201	#define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))	372	#define ecb_array_length(name) (sizeof (name) / sizeof (name [0]))
202	#endif	373	#endif
203		374
204	ECB_INLINE uint32_t ecb_rotr32 (uint32_t x, unsigned int count) ecb_const;
205	ECB_INLINE uint32_t
206	ecb_rotr32 (uint32_t x, unsigned int count)
207	{
208	return (x << (32 - count)) \| (x >> count);
209	}
210
211	ECB_INLINE uint32_t ecb_rotl32 (uint32_t x, unsigned int count) ecb_const;
212	ECB_INLINE uint32_t
213	ecb_rotl32 (uint32_t x, unsigned int count)
214	{
215	return (x >> (32 - count)) \| (x << count);
216	}
217
218	#endif	375	#endif
219		376

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing libecb/ecb.h (file contents): Revision 1.32 by root, Wed Jun 1 01:02:31 2011 UTC vs. Revision 1.58 by root, Wed Aug 3 15:40:18 2011 UTC

Diff Legend

Comparing libecb/ecb.h (file contents):
Revision 1.32 by root, Wed Jun 1 01:02:31 2011 UTC vs.
Revision 1.58 by root, Wed Aug 3 15:40:18 2011 UTC