← Back to branch summary

~ubuntu-branches/ubuntu/wily/sflphone/wily

« back to all changes in this revision

Viewing changes to daemon/libs/pjproject-2.2.1/pjlib/include/pj/compat/ctype.h

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2015-08-12 07:25:39 UTC
  • mfrom: (4.3.6 sid)
  • Revision ID: package-import@ubuntu.com-20150812072539-uzh89mqziqijbda4
Tags: 1.4.1-0.2ubuntu1
http://bugs.debian.org/795233
* Merge with Debian unstable. Remaining Ubuntu changes:
  - Drop soprano, nepomuk build-deps.
* debian/patches/gcc-5.patch: Remove ambiguous std::string(0, 0)
  instantiation, to fix FTBFS. (Closes: #795233)

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/libs/pjproject-2.2.1/pjlib/include/pj/compat/ctype.h
41
41
#  define toupper(c)        (((c) >= 'a' && (c) <= 'z') ? (c)-('a'-'A') : (c))
42
42
#endif
43
43
 
44
 
#ifndef isblank
 
44
#ifndef __USE_ISOC99
 
45
# ifndef isblank
45
46
#   define isblank(c)       (c==' ' || c=='\t')
46
 
#endif
 
47
# endif
 
48
#endif /* __USE_ISOC99 */
47
49
 
48
50
 
49
51
#endif  /* __PJ_COMPAT_CTYPE_H__ */