Changeset 142

Timestamp:

Feb 7, 2006 7:01:58 PM (18 years ago)

Author:

bennylp

Message:

Fixed Makefile and warnings in cygwin/mingw

Location:

pjproject/trunk/pjlib-util

Files:

• build/Makefile (modified) (1 diff)
• include/pjlib-util/scanner_cis_bitwise.h (modified) (3 diffs)
• include/pjlib-util/scanner_cis_uint.h (modified) (3 diffs)
• src/pjlib-util/scanner.c (modified) (1 diff)

pjproject/trunk/pjlib-util/build/Makefile

@@ -23 +23 @@
 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)
 

pjproject/trunk/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h

@@ -70 +70 @@
  * @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))
 
 /**
@@ -79 +79 @@
  * @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))
 
 /**
@@ -88 +88 @@
  * @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))
 
 

pjproject/trunk/pjlib-util/include/pjlib-util/scanner_cis_uint.h

@@ -57 +57 @@
  * @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)
 
 /**
@@ -66 +66 @@
  * @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)
 
 /**
@@ -75 +75 @@
  * @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])
 
 

pjproject/trunk/pjlib-util/src/pjlib-util/scanner.c

@@ -484 +484 @@
                                  unsigned N, pj_bool_t skip_ws)
 {
-    char *start = scanner->curptr;
-
     if (scanner->curptr + N > scanner->end) {
         pj_scan_syntax_err(scanner);