diff options
author | Benny Prijono <bennylp@teluu.com> | 2006-02-07 19:01:58 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2006-02-07 19:01:58 +0000 |
commit | f155e2912011717b2f88a91fe15da93f4d0b0078 (patch) | |
tree | 38249b0e2fe2da4ccb1bc3357f8c53458e0207c8 /pjlib-util | |
parent | 813cd5ef6791ddf9778ca61c08ce19f48202b3bc (diff) |
Fixed Makefile and warnings in cygwin/mingw
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@142 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib-util')
-rw-r--r-- | pjlib-util/build/Makefile | 2 | ||||
-rw-r--r-- | pjlib-util/include/pjlib-util/scanner_cis_bitwise.h | 6 | ||||
-rw-r--r-- | pjlib-util/include/pjlib-util/scanner_cis_uint.h | 6 | ||||
-rw-r--r-- | pjlib-util/src/pjlib-util/scanner.c | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/pjlib-util/build/Makefile b/pjlib-util/build/Makefile index c9bdc24b..b163a0a7 100644 --- a/pjlib-util/build/Makefile +++ b/pjlib-util/build/Makefile @@ -22,7 +22,7 @@ export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \ # export PJLIB_UTIL_SRCDIR = ../src/pjlib-util export PJLIB_UTIL_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ - md5.o scanner.o stun.o stun_client.o xml.o + md5.o scanner.o stun.o string.o stun.o stun_client.o xml.o export PJLIB_UTIL_CFLAGS += $(_CFLAGS) ############################################################################### diff --git a/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h b/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h index 3f466941..9d0b2adc 100644 --- a/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h +++ b/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h @@ -69,7 +69,7 @@ typedef struct pj_cis_t * @param cis Pointer to character input specification. * @param c The character. */ -#define PJ_CIS_SET(cis,c) ((cis)->cis_buf[(c)] |= (1 << (cis)->cis_id)) +#define PJ_CIS_SET(cis,c) ((cis)->cis_buf[(int)(c)] |= (1 << (cis)->cis_id)) /** * Remove the membership of the specified character. @@ -78,7 +78,7 @@ typedef struct pj_cis_t * @param cis Pointer to character input specification. * @param c The character to be removed from the membership. */ -#define PJ_CIS_CLR(cis,c) ((cis)->cis_buf[c] &= ~(1 << (cis)->cis_id)) +#define PJ_CIS_CLR(cis,c) ((cis)->cis_buf[(int)c] &= ~(1 << (cis)->cis_id)) /** * Check the membership of the specified character. @@ -87,7 +87,7 @@ typedef struct pj_cis_t * @param cis Pointer to character input specification. * @param c The character. */ -#define PJ_CIS_ISSET(cis,c) ((cis)->cis_buf[c] & (1 << (cis)->cis_id)) +#define PJ_CIS_ISSET(cis,c) ((cis)->cis_buf[(int)c] & (1 << (cis)->cis_id)) diff --git a/pjlib-util/include/pjlib-util/scanner_cis_uint.h b/pjlib-util/include/pjlib-util/scanner_cis_uint.h index eb779f6b..ea010114 100644 --- a/pjlib-util/include/pjlib-util/scanner_cis_uint.h +++ b/pjlib-util/include/pjlib-util/scanner_cis_uint.h @@ -56,7 +56,7 @@ typedef struct pj_cis_t * @param cis Pointer to character input specification. * @param c The character. */ -#define PJ_CIS_SET(cis,c) ((cis)->cis_buf[(c)] = 1) +#define PJ_CIS_SET(cis,c) ((cis)->cis_buf[(int)(c)] = 1) /** * Remove the membership of the specified character. @@ -65,7 +65,7 @@ typedef struct pj_cis_t * @param cis Pointer to character input specification. * @param c The character to be removed from the membership. */ -#define PJ_CIS_CLR(cis,c) ((cis)->cis_buf[c] = 0) +#define PJ_CIS_CLR(cis,c) ((cis)->cis_buf[(int)c] = 0) /** * Check the membership of the specified character. @@ -74,7 +74,7 @@ typedef struct pj_cis_t * @param cis Pointer to character input specification. * @param c The character. */ -#define PJ_CIS_ISSET(cis,c) ((cis)->cis_buf[c]) +#define PJ_CIS_ISSET(cis,c) ((cis)->cis_buf[(int)c]) diff --git a/pjlib-util/src/pjlib-util/scanner.c b/pjlib-util/src/pjlib-util/scanner.c index 0c6899ba..0447377a 100644 --- a/pjlib-util/src/pjlib-util/scanner.c +++ b/pjlib-util/src/pjlib-util/scanner.c @@ -483,8 +483,6 @@ PJ_DEF(void) pj_scan_get_until_chr( pj_scanner *scanner, PJ_DEF(void) pj_scan_advance_n( pj_scanner *scanner, unsigned N, pj_bool_t skip_ws) { - char *start = scanner->curptr; - if (scanner->curptr + N > scanner->end) { pj_scan_syntax_err(scanner); return; |