Make it harder to forget to redefine uthash_fatal

kitty/disk-cache.c

@@ -13,7 +13,7 @@
 
 #include "disk-cache.h"
 #include "safe-wrappers.h"
-#include "uthash.h"
+#include "kitty-uthash.h"
 #include "loop-utils.h"
 #include "threading.h"
 #include "cross-platform-random.h"
@@ -25,8 +25,6 @@
 #ifdef HAS_SENDFILE
 #include <sys/sendfile.h>
 #endif
-#undef uthash_fatal
-#define uthash_fatal(msg) fatal(msg)
 
 
 typedef struct {

kitty/glyph-cache.c

@@ -6,11 +6,7 @@
  */
 
 #include "glyph-cache.h"
-#include "uthash.h"
+#include "kitty-uthash.h"
-
-
-#undef uthash_fatal
-#define uthash_fatal(msg) fatal(msg)
 
 
 typedef struct SpritePosItem {

kitty/hyperlink.c

@@ -6,14 +6,12 @@
  */
 
 #include "hyperlink.h"
-#include "uthash.h"
+#include "kitty-uthash.h"
 #include <string.h>
 
 #define MAX_KEY_LEN 2048
 #define MAX_ID_LEN 256
 #define MAX_ADDS_BEFORE_GC 256
-#undef uthash_fatal
-#define uthash_fatal(msg) fatal(msg)
 
 typedef struct {
     const char *key;

kitty/kitty-uthash.h

@@ -0,0 +1,11 @@
+/*
+ * Copyright (C) 2021 Kovid Goyal <kovid at kovidgoyal.net>
+ *
+ * Distributed under terms of the GPL3 license.
+ */
+
+#pragma once
+
+#include "data-types.h"
+#define uthash_fatal(msg) fatal(msg)
+#include "uthash.h"