the repository which powers this website
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 <[email protected]>
John Keeping 2015-08-13
parent e09574b · commit 7105a78
-rw-r--r--cgit.h3
-rw-r--r--ui-tree.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/cgit.h b/cgit.h
index 508179a7..f3276276 100644
--- a/cgit.h
+++ b/cgit.h
@@ -25,6 +25,9 @@
#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
diff --git a/ui-tree.c b/ui-tree.c
index c8d24f65..2dbe89ea 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -6,7 +6,6 @@
* (see COPYING for full license text)
*/
-#include <ctype.h>
#include "cgit.h"
#include "ui-tree.h"
#include "html.h"