all repos — cgit @ 7105a78b17b118866aee77735e26cffcd1fd08fd

a hyperfast web frontend for git written in c

ui-tree: use "sane" isgraph()

Git's git-compat-util.h defines a "sane ctype" that does not use locale
information and works with signed chars, but it does not include
isgraph() so we have included ctype.h ourselves.

However, this means we have to include a system header before
git-compat-util.h which may lead to the system defining some macros
(e.g. _FILE_OFFSET_BITS on Solaris) before git-compat-util.h redefines
them with a different value.  We cannot include ctype.h after
git-compat-util.h because we have defined many of its functions as
macros which causes a stream of compilation errors.

Defining our own "sane" isgraph() using Git's sane isprint() and
isspace() avoids all of these problems.

Signed-off-by: John Keeping <john@keeping.me.uk>
John Keeping john@keeping.me.uk
Thu, 13 Aug 2015 12:14:19 +0100
commit

7105a78b17b118866aee77735e26cffcd1fd08fd

parent

e09574bdf6cfbd21ff0a58a18f34d4a11db824d7

2 files changed, 3 insertions(+), 1 deletions(-)

jump to
M cgit.hcgit.h

@@ -25,6 +25,9 @@ #include <utf8.h>

#include <notes.h> #include <graph.h> +/* Add isgraph(x) to Git's sane ctype support (see git-compat-util.h) */ +#undef isgraph +#define isgraph(x) (isprint((x)) && !isspace((x))) /* * Dateformats used on misc. pages
M ui-tree.cui-tree.c

@@ -6,7 +6,6 @@ * Licensed under GNU General Public License v2

* (see COPYING for full license text) */ -#include <ctype.h> #include "cgit.h" #include "ui-tree.h" #include "html.h"