From 554310847afe2d6148e62343cd15d39fa7209937 Mon Sep 17 00:00:00 2001
From: Daniel Mendler <mail@daniel-mendler.de>
Date: Wed, 16 Oct 2019 09:26:04 +0200
Subject: [PATCH] tommath.h: use enums

---
 makefile_include.mk |  2 +-
 tommath.h           | 33 +++++----------------------------
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/makefile_include.mk b/makefile_include.mk
index cdf0fa7dd..7d0b997d9 100644
--- a/makefile_include.mk
+++ b/makefile_include.mk
@@ -62,7 +62,7 @@ endif
 ifdef CONV_WARNINGS
 LTM_CFLAGS += -std=c89 -Wconversion -Wsign-conversion
 ifeq ($(CONV_WARNINGS), strict)
-LTM_CFLAGS += -DMP_USE_ENUMS -Wc++-compat
+LTM_CFLAGS += -Wc++-compat
 endif
 else
 LTM_CFLAGS += -Wsystem-headers
diff --git a/tommath.h b/tommath.h
index 8dd3bb34c..5af5014e2 100644
--- a/tommath.h
+++ b/tommath.h
@@ -115,20 +115,22 @@ typedef uint64_t             private_mp_word;
 #define LTM_PRIME_SAFE     (MP_DEPRECATED_PRAGMA("LTM_PRIME_SAFE has been deprecated, use MP_PRIME_SAFE") MP_PRIME_SAFE)
 #define LTM_PRIME_2MSB_ON  (MP_DEPRECATED_PRAGMA("LTM_PRIME_2MSB_ON has been deprecated, use MP_PRIME_2MSB_ON") MP_PRIME_2MSB_ON)
 
-#ifdef MP_USE_ENUMS
 typedef enum {
    MP_ZPOS = 0,   /* positive */
    MP_NEG = 1     /* negative */
 } mp_sign;
+
 typedef enum {
    MP_LT = -1,    /* less than */
    MP_EQ = 0,     /* equal */
    MP_GT = 1      /* greater than */
 } mp_ord;
+
 typedef enum {
    MP_NO = 0,
    MP_YES = 1
 } mp_bool;
+
 typedef enum {
    MP_OKAY  = 0,   /* no error */
    MP_ERR   = -1,  /* unknown error */
@@ -137,42 +139,17 @@ typedef enum {
    MP_ITER  = -4,  /* maximum iterations reached */
    MP_BUF   = -5,  /* buffer overflow, supplied buffer too small */
 } mp_err;
+
 typedef enum {
    MP_LSB_FIRST = -1,
    MP_MSB_FIRST =  1
 } mp_order;
+
 typedef enum {
    MP_LITTLE_ENDIAN  = -1,
    MP_NATIVE_ENDIAN  =  0,
    MP_BIG_ENDIAN     =  1
 } mp_endian;
-#else
-typedef int mp_sign;
-#define MP_ZPOS       0   /* positive integer */
-#define MP_NEG        1   /* negative */
-typedef int mp_ord;
-#define MP_LT        -1   /* less than */
-#define MP_EQ         0   /* equal to */
-#define MP_GT         1   /* greater than */
-typedef int mp_bool;
-#define MP_YES        1
-#define MP_NO         0
-typedef int mp_err;
-#define MP_OKAY       0   /* no error */
-#define MP_ERR        -1  /* unknown error */
-#define MP_MEM        -2  /* out of mem */
-#define MP_VAL        -3  /* invalid input */
-#define MP_RANGE      (MP_DEPRECATED_PRAGMA("MP_RANGE has been deprecated in favor of MP_VAL") MP_VAL)
-#define MP_ITER       -4  /* maximum iterations reached */
-#define MP_BUF        -5  /* buffer overflow, supplied buffer too small */
-typedef int mp_order;
-#define MP_LSB_FIRST -1
-#define MP_MSB_FIRST  1
-typedef int mp_endian;
-#define MP_LITTLE_ENDIAN  -1
-#define MP_NATIVE_ENDIAN  0
-#define MP_BIG_ENDIAN     1
-#endif
 
 /* tunable cutoffs */