Merge git://github.com/rfc1036/whoisHEADmaster

1 files changed, 9 insertions, 2 deletions

diff --git a/utils.h b/utils.h
index 0f226ae..32055b3 100644
--- a/utils.h
+++ b/utils.h
@@ -9,6 +9,10 @@
 
 #define NOFAIL(ptr) do_nofail((ptr), __FILE__, __LINE__)
 
+#ifndef AFL_MODE
+# define AFL_MODE 0
+#endif
+
 /* Portability macros */
 #ifdef __GNUC__
 # define NORETURN __attribute__((noreturn))
@@ -45,12 +49,15 @@
 # define ngettext(a, b, c) ((c==1) ? (a) : (b))
 #endif
 
+#if defined IDN2_VERSION_NUMBER && IDN2_VERSION_NUMBER < 0x00140000
+# define IDN2_NONTRANSITIONAL IDN2_NFC_INPUT
+#endif
 
 /* Prototypes */
 void *do_nofail(void *ptr, const char *file, const int line);
 char **merge_args(char *args, char *argv[], int *argc);
 
-void err_quit(const char *fmt, ...) NORETURN;
-void err_sys(const char *fmt, ...) NORETURN;
+void NORETURN err_quit(const char *fmt, ...);
+void NORETURN err_sys(const char *fmt, ...);
 
 #endif