diff options
Diffstat (limited to 'src/lib9/utf/utfdef.h')
| -rw-r--r-- | src/lib9/utf/utfdef.h | 35 |
1 files changed, 8 insertions, 27 deletions
diff --git a/src/lib9/utf/utfdef.h b/src/lib9/utf/utfdef.h index ba3749a9c..adc6d95fb 100644 --- a/src/lib9/utf/utfdef.h +++ b/src/lib9/utf/utfdef.h @@ -12,36 +12,17 @@ * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE. */ -/* - * compiler directive on Plan 9 - */ -#ifndef USED -#define USED(x) if(x);else -#endif +#define uchar _utfuchar +#define ushort _utfushort +#define uint _utfuint +#define ulong _utfulong +#define vlong _utfvlong +#define uvlong _utfuvlong -/* - * easiest way to make sure these are defined - */ -#define uchar _fmtuchar -#define ushort _fmtushort -#define uint _fmtuint -#define ulong _fmtulong -#define vlong _fmtvlong -#define uvlong _fmtuvlong typedef unsigned char uchar; typedef unsigned short ushort; typedef unsigned int uint; typedef unsigned long ulong; -typedef unsigned long long uvlong; -typedef long long vlong; - -/* - * nil cannot be ((void*)0) on ANSI C, - * because it is used for function pointers - */ -#undef nil -#define nil 0 - -#undef nelem -#define nelem ((void*)0) +#define nelem(x) (sizeof(x)/sizeof((x)[0])) +#define nil ((void*)0) |