From 8b02b357e9f90d3dc415ca52047d4ad8bf6dcce4 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Lukas=20Sandstr=C3=B6m?= Date: Tue, 22 Sep 2009 16:34:07 +0200 Subject: [PATCH] Fix the define UCHAR problem. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Use typedef instead of #define to avoid conflicts with sqltypes.h from unixODBC. Signed-off-by: Lukas Sandström --- filter.h | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/filter.h b/filter.h index 3c26333..dd39e2f 100644 --- a/filter.h +++ b/filter.h @@ -47,9 +47,12 @@ //---------------------- Types --------------------------------------------- -#define UCHAR unsigned char -#define USHORT unsigned short -#define ULONG unsigned long +#undef UCHAR +#undef USHORT +#undef ULONG +typedef unsigned char UCHAR; +typedef unsigned short USHORT; +typedef unsigned long ULONG; enum{ _UCHAR, -- 1.6.3.3