--- np2/common/rect.h 2003/10/16 17:57:10 1.1.1.1 +++ np2/common/rect.h 2005/03/20 06:09:16 1.3 @@ -1,8 +1,4 @@ -#ifdef __cplusplus -extern "C" { -#endif - typedef struct { int x; int y; @@ -34,9 +30,13 @@ typedef struct { } UNIRECT; -BOOL rect_in(const RECT_T *rect, int x, int y); +#ifdef __cplusplus +extern "C" { +#endif + +BRESULT rect_in(const RECT_T *rect, int x, int y); int rect_num(const RECT_T *rect, int cnt, int x, int y); -BOOL rect_isoverlap(const RECT_T *r1, const RECT_T *r2); +BRESULT rect_isoverlap(const RECT_T *r1, const RECT_T *r2); void rect_enumout(const RECT_T *tag, const RECT_T *base, void *arg, void (*outcb)(void *arg, const RECT_T *rect)); void rect_add(RECT_T *dst, const RECT_T *src);