From 3e56b420d07fbf3c0b624f84445af2e9af7856c7 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 2 Aug 2024 04:31:20 +0000
Subject: [PATCH 1/2] Remove support for `int` sizes other than 32 bits

No viable platform uses anything other than 32 bits for `int`.
---
 lib/abcesop/eabc/exor.h | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/lib/abcesop/eabc/exor.h b/lib/abcesop/eabc/exor.h
index ed278c162..39e81f44d 100644
--- a/lib/abcesop/eabc/exor.h
+++ b/lib/abcesop/eabc/exor.h
@@ -55,7 +55,7 @@ namespace abc::exorcism {
 ///                       MACRO DEFINITIONS                          ///
 ////////////////////////////////////////////////////////////////////////
 
-// the number of bits per integer (can be 16, 32, 64 - tested for 32)
+// the number of bits per integer
 #define BPI                 32 
 #define BPIMASK             31 
 #define LOGBPI               5
@@ -71,17 +71,8 @@ namespace abc::exorcism {
 // the following number of cube pairs are allocated:
 // nCubesAlloc/CUBE_PAIR_FACTOR
 
-#if BPI == 64
-#define DIFFERENT   0x5555555555555555
-#define BIT_COUNT(w)   (BitCount[(w)&0xffff] + BitCount[((w)>>16)&0xffff] + BitCount[((w)>>32)&0xffff] + BitCount[(w)>>48])
-#elif BPI == 32
 #define DIFFERENT   0x55555555
 #define BIT_COUNT(w)   (BitCount[(w)&0xffff] + BitCount[(w)>>16])
-#else
-#define DIFFERENT   0x5555
-#define BIT_COUNT(w)   (BitCount[(w)])
-#endif
-
 
 #define VarWord(element)  ((element)>>LOGBPI)
 #define VarBit(element)   ((element)&BPIMASK)

From ce24711c82c736261af2d08854616e24d2e79384 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 2 Aug 2024 04:31:44 +0000
Subject: [PATCH 2/2] Replace `#define`s with enum constants and inline
 functions in `exor.h`

This avoids issues with short/common identifiers like `BPI`
and `DIFFERENT` colliding with identifiers used in other projects.
---
 lib/abcesop/eabc/exor.h | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/lib/abcesop/eabc/exor.h b/lib/abcesop/eabc/exor.h
index 39e81f44d..6a25ccf0a 100644
--- a/lib/abcesop/eabc/exor.h
+++ b/lib/abcesop/eabc/exor.h
@@ -55,29 +55,34 @@ namespace abc::exorcism {
 ///                       MACRO DEFINITIONS                          ///
 ////////////////////////////////////////////////////////////////////////
 
-// the number of bits per integer
-#define BPI                 32 
-#define BPIMASK             31 
-#define LOGBPI               5
+enum {
+  // the number of bits per integer
+  BPI = 32,
+  BPIMASK = 31,
+  LOGBPI = 5,
 
-// the maximum number of input variables
-#define MAXVARS           1000
+  // the maximum number of input variables
+  MAXVARS = 1000,
 
-// the number of cubes that are allocated additionally
-#define ADDITIONAL_CUBES    33
+  // the number of cubes that are allocated additionally
+  ADDITIONAL_CUBES = 33,
 
-// the factor showing how many cube pairs will be allocated
-#define CUBE_PAIR_FACTOR    20
-// the following number of cube pairs are allocated:
-// nCubesAlloc/CUBE_PAIR_FACTOR
+  // the factor showing how many cube pairs will be allocated
+  CUBE_PAIR_FACTOR = 20,
+  // the following number of cube pairs are allocated:
+  // nCubesAlloc/CUBE_PAIR_FACTOR
 
-#define DIFFERENT   0x55555555
-#define BIT_COUNT(w)   (BitCount[(w)&0xffff] + BitCount[(w)>>16])
+  DIFFERENT = 0x55555555,
+};
 
-#define VarWord(element)  ((element)>>LOGBPI)
-#define VarBit(element)   ((element)&BPIMASK)
+extern unsigned char BitCount[];
 
-#define TICKS_TO_SECONDS(time) ((float)(time)/(float)(CLOCKS_PER_SEC))
+static inline int BIT_COUNT(int w) { return BitCount[(w)&0xffff] + BitCount[(w)>>16]; }
+
+static inline int VarWord(int element) { return element>>LOGBPI; }
+static inline int VarBit(int element) { return element&BPIMASK; }
+
+static inline float TICKS_TO_SECONDS(abctime time) { return (float)time/(float)CLOCKS_PER_SEC; }
 
 ////////////////////////////////////////////////////////////////////////
 ///                  CUBE COVER and CUBE typedefs                    ///