From b637146095e96ef8a0a8a92a950f594b277c65ce Mon Sep 17 00:00:00 2001
From: Bruno Raoult <braoult@gmail.com>
Date: Mon, 5 Feb 2024 14:08:28 +0100
Subject: [PATCH] br.h -> brlib.h

---
 include/bitops-emulated/generic-clz.h   | 2 +-
 include/bitops-emulated/generic-ctz.h   | 2 +-
 include/bitops-emulated/generic-ilog2.h | 2 +-
 include/bitops.h                        | 2 +-
 include/{br.h => brlib.h}               | 8 ++++----
 include/debug.h                         | 2 +-
 include/hash.h                          | 2 +-
 include/pjwhash-inline.h                | 2 +-
 include/pjwhash.h                       | 2 +-
 include/pool.h                          | 2 +-
 src/list_sort.c                         | 2 +-
 src/pool.c                              | 2 +-
 12 files changed, 15 insertions(+), 15 deletions(-)
 rename include/{br.h => brlib.h} (98%)

diff --git a/include/bitops-emulated/generic-clz.h b/include/bitops-emulated/generic-clz.h
index 1b6f033..1b905fb 100644
--- a/include/bitops-emulated/generic-clz.h
+++ b/include/bitops-emulated/generic-clz.h
@@ -13,7 +13,7 @@
 #ifndef _GENERIC_CLZ_H_
 #define _GENERIC_CLZ_H_
 
-#include "br.h"
+#include "brlib.h"
 
 /* Adapted from: http://www-graphics.stanford.edu/%7Eseander/bithacks.html
  */
diff --git a/include/bitops-emulated/generic-ctz.h b/include/bitops-emulated/generic-ctz.h
index 4045e35..885c4cf 100644
--- a/include/bitops-emulated/generic-ctz.h
+++ b/include/bitops-emulated/generic-ctz.h
@@ -13,7 +13,7 @@
 #ifndef _GENERIC_CTZ_H_
 #define _GENERIC_CTZ_H_
 
-#include "br.h"
+#include "brlib.h"
 
 /* Adapted from: http://www-graphics.stanford.edu/%7Eseander/bithacks.html
  */
diff --git a/include/bitops-emulated/generic-ilog2.h b/include/bitops-emulated/generic-ilog2.h
index c3a9aad..c0748c5 100644
--- a/include/bitops-emulated/generic-ilog2.h
+++ b/include/bitops-emulated/generic-ilog2.h
@@ -13,7 +13,7 @@
 #ifndef _GENERIC_ILOG2_H_
 #define _GENERIC_ILOG2_H_
 
-#include "br.h"
+#include "brlib.h"
 
 /*
  * See https://stackoverflow.com/a/11398748/3079831
diff --git a/include/bitops.h b/include/bitops.h
index 346d2b1..752cd81 100644
--- a/include/bitops.h
+++ b/include/bitops.h
@@ -13,7 +13,7 @@
 #ifndef _BITS_H
 #define _BITS_H
 
-#include "br.h"
+#include "brlib.h"
 #include "bitops-emulated/generic-ctz.h"
 #include "bitops-emulated/generic-clz.h"
 
diff --git a/include/br.h b/include/brlib.h
similarity index 98%
rename from include/br.h
rename to include/brlib.h
index 36c1642..6455f8a 100644
--- a/include/br.h
+++ b/include/brlib.h
@@ -1,4 +1,4 @@
-/* br.h - misc macros.
+/* brlib.h - misc types/macros.
  *
  * Copyright (C) 2021-2024 Bruno Raoult ("br")
  * Licensed under the GNU General Public License v3.0 or later.
@@ -15,8 +15,8 @@
  * This header contains generic stuff.
  */
 
-#ifndef _BR_H
-#define _BR_H
+#ifndef _BRLIB_H
+#define _BRLIB_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -267,4 +267,4 @@ typedef signed char schar;
 	({ signed type __x = (x); __x < 0 ? -__x : __x; }), other)
 
 
-#endif  /* _BR_H */
+#endif  /* _BRLIB_H */
diff --git a/include/debug.h b/include/debug.h
index 01f2bab..f16c892 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include <stdbool.h>
 
-#include <br.h>
+#include "brlib.h"
 
 #define NANOSEC  1000000000                       /* nano sec in sec */
 #define MILLISEC 1000000                          /* milli sec in sec */
diff --git a/include/hash.h b/include/hash.h
index 409178d..a343d0f 100644
--- a/include/hash.h
+++ b/include/hash.h
@@ -10,7 +10,7 @@
 
 #include <asm/bitsperlong.h>
 
-#include "br.h"
+#include "brlib.h"
 #include "bitops.h"
 
 /*
diff --git a/include/pjwhash-inline.h b/include/pjwhash-inline.h
index 625b86d..7fda371 100644
--- a/include/pjwhash-inline.h
+++ b/include/pjwhash-inline.h
@@ -14,7 +14,7 @@
 #ifndef _PJWHASH_INLINE_H
 #define _PJWHASH_INLINE_H
 
-#include "br.h"
+#include "brlib.h"
 
 #define THREE_QUARTERS ((int) ((BITS_PER_INT * 3) / 4))
 #define ONE_EIGHTH     ((int) (BITS_PER_INT / 8))
diff --git a/include/pjwhash.h b/include/pjwhash.h
index 2e8835d..31f9eb4 100644
--- a/include/pjwhash.h
+++ b/include/pjwhash.h
@@ -13,7 +13,7 @@
 #ifndef _PJWHASH_H
 #define _PJWHASH_H
 
-#include "br.h"
+#include "brlib.h"
 
 /**
  * unsigned int pjwhash - PJW hash function
diff --git a/include/pool.h b/include/pool.h
index d2e1412..690f14f 100644
--- a/include/pool.h
+++ b/include/pool.h
@@ -17,7 +17,7 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include "br.h"
+#include "brlib.h"
 #include "list.h"
 
 #define POOL_NAME_LENGTH (16)                     /* max name length including trailing \0 */
diff --git a/src/list_sort.c b/src/list_sort.c
index 962dcc7..d00fe5d 100644
--- a/src/list_sort.c
+++ b/src/list_sort.c
@@ -3,7 +3,7 @@
 /*
  * Taken from linux kernel: lib/list_sort.c
  */
-#include "br.h"
+#include "brlib.h"
 #include "list_sort.h"
 #include "list.h"
 #include "likely.h"
diff --git a/src/pool.c b/src/pool.c
index e507b25..abe027c 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include "br.h"
+#include "brlib.h"
 #include "list.h"
 #include "pool.h"
 #include "debug.h"