Git fork

Merge branch 'ps/sane-ctype-workaround'

Our <sane-ctype.h> header file relied on that the system-supplied
<ctype.h> header is not later included, which would override our
macro definitions, but "amazon linux" broke this assumption. Fix
this by preemptively including <ctype.h> near the beginning of
<sane-ctype.h> ourselves.

* ps/sane-ctype-workaround:
sane-ctype: fix compiler error on Amazon Linux 2

+9
+9
sane-ctype.h
··· 1 1 #ifndef SANE_CTYPE_H 2 2 #define SANE_CTYPE_H 3 3 4 + /* 5 + * Explicitly include <ctype.h> so that its header guards kick in from here on. 6 + * This ensures that the file won't get included after "sane-ctype.h", as that 7 + * would otherwise lead to a compiler error because the function declarations 8 + * for `int isascii(int c)` et al would be mangled by our macros with the same 9 + * name. 10 + */ 11 + #include <ctype.h> 12 + 4 13 /* Sane ctype - no locale, and works with signed chars */ 5 14 #undef isascii 6 15 #undef isspace