Changeset 5599

Timestamp:

Jun 5, 2017 3:31:18 AM (7 years ago)

Author:

riza

Message:

Fixed #2019: Conflict with 'isblank' when using g++ 5.4.0. Thanks to Ken Mastro
for the report and suggested fix.

Location:

pjproject/trunk/pjlib/include/pj

Files:

• compat/ctype.h (modified) (1 diff)
• ctype.h (modified) (1 diff)

pjproject/trunk/pjlib/include/pj/compat/ctype.h

@@ -42 +42 @@
 #endif
 
-#ifndef isblank
-#   define isblank(c)       (c==' ' || c=='\t')
-#endif
-
 
 #endif  /* __PJ_COMPAT_CTYPE_H__ */

pjproject/trunk/pjlib/include/pj/ctype.h

@@ -110 +110 @@
  *              tab ('\\t') character.
  */
-PJ_INLINE(int) pj_isblank(unsigned char c) { return isblank(c); }
+PJ_INLINE(int) pj_isblank(unsigned char c) { return (c==' ' || c=='\t'); }
 
 /**