|
From: <sv...@va...> - 2005-11-17 12:14:45
|
Author: tom
Date: 2005-11-17 12:14:42 +0000 (Thu, 17 Nov 2005)
New Revision: 5164
Log:
Removed vki_ntohs definition and the infrastructure that supported
it as it is no longer used.
Modified:
trunk/include/vki-linux.h
Modified: trunk/include/vki-linux.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/include/vki-linux.h 2005-11-17 12:02:58 UTC (rev 5163)
+++ trunk/include/vki-linux.h 2005-11-17 12:14:42 UTC (rev 5164)
@@ -182,58 +182,6 @@
};
=20
//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/linux/byteorder/swab.h
-//----------------------------------------------------------------------
-
-#define ___vki_swab16(x) \
-({ \
- __vki_u16 __x =3D (x); \
- ((__vki_u16)( \
- (((__vki_u16)(__x) & (__vki_u16)0x00ffU) << 8) | \
- (((__vki_u16)(__x) & (__vki_u16)0xff00U) >> 8) )); \
-})
-
-/*
- * provide defaults when no architecture-specific optimization is detect=
ed
- */
-#ifndef __vki_arch__swab16
-# define __vki_arch__swab16(x) ({ __vki_u16 __tmp =3D (x) ; ___vki_swab=
16(__tmp); })
-#endif
-
-// [[Nb: using the non-OPTIMIZE version here -- easier to understand, an=
d
-// we don't need the optimised version as we use this very rarely]]
-# define __vki_swab16(x) __vki_fswab16(x)
-
-static __inline__ __attribute_const__ __vki_u16 __vki_fswab16(__vki_u16 =
x)
-{
- return __vki_arch__swab16(x);
-}
-
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/linux/byteorder/little_endian.h
-//----------------------------------------------------------------------
-
-#ifdef VKI_LITTLE_ENDIAN
-#define __vki_be16_to_cpu(x) __vki_swab16((x))
-#endif // VKI_LITTLE_ENDIAN
-
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/linux/byteorder/big_endian.h
-//----------------------------------------------------------------------
-
-#ifdef VKI_BIG_ENDIAN
-#define __vki_be16_to_cpu(x) ((__vki_u16)(x))
-#endif // VKI_BIG_ENDIAN
-
-//----------------------------------------------------------------------
-// From linux-2.6.8.1/include/linux/byteorder/generic.h
-//----------------------------------------------------------------------
-
-#define ___vki_ntohs(x) __vki_be16_to_cpu(x)
-
-#define vki_ntohs(x) ___vki_ntohs(x)
-
-//----------------------------------------------------------------------
// From linux-2.6.8.1/include/linux/time.h
//----------------------------------------------------------------------
=20
|
|
From: Nicholas N. <nj...@cs...> - 2005-11-17 19:35:39
|
On Thu, 17 Nov 2005, sv...@va... wrote: > Log: > Removed vki_ntohs definition and the infrastructure that supported > it as it is no longer used. Nice! I hated that code. Nick |