From dfbb5ecd56b5e0580df8598a2cbaa35c83d8d2a7 Mon Sep 17 00:00:00 2001
From: nijtmans <jan.nijtmans@gmail.com>
Date: Thu, 6 Jun 2019 16:22:54 +0200
Subject: [PATCH] MSVC compile:  higher warning-level -Wall, but warning-free

---
 demo/test.c   | 6 ++++--
 makefile.msvc | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/demo/test.c b/demo/test.c
index 8627bf2..748be4b 100644
--- a/demo/test.c
+++ b/demo/test.c
@@ -622,6 +622,7 @@ LBL_ERR:
 
 }
 
+#if defined(__STDC_IEC_559__) || defined(__GCC_IEC_559)
 static int test_mp_set_double(void)
 {
    int i;
@@ -632,7 +633,6 @@ static int test_mp_set_double(void)
    }
 
    /* test mp_get_double/mp_set_double */
-#if defined(__STDC_IEC_559__) || defined(__GCC_IEC_559)
    if (mp_set_double(&a, +1.0/0.0) != MP_VAL) {
       printf("\nmp_set_double should return MP_VAL for +inf");
       goto LBL_ERR;
@@ -670,7 +670,6 @@ static int test_mp_set_double(void)
          goto LBL_ERR;
       }
    }
-#endif
 
    mp_clear_multi(&a, &b, NULL);
    return EXIT_SUCCESS;
@@ -679,6 +678,7 @@ LBL_ERR:
    return EXIT_FAILURE;
 
 }
+#endif
 
 static int test_mp_get_u32(void)
 {
@@ -2112,7 +2112,9 @@ int unit_tests(int argc, char **argv)
       T(mp_read_radix),
       T(mp_reduce_2k),
       T(mp_reduce_2k_l),
+#if defined(__STDC_IEC_559__) || defined(__GCC_IEC_559)
       T(mp_set_double),
+#endif
       T(mp_signed_rsh),
       T(mp_sqrt),
       T(mp_sqrtmod_prime),
diff --git a/makefile.msvc b/makefile.msvc
index 2381b17..d0d6a56 100644
--- a/makefile.msvc
+++ b/makefile.msvc
@@ -14,7 +14,7 @@ PREFIX    = c:\devel
 CFLAGS    = /Ox
 
 #Compilation flags
-LTM_CFLAGS  = /nologo /I./ /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_DEPRECATE /W3 $(CFLAGS)
+LTM_CFLAGS  = /nologo /I./ /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_DEPRECATE /Wall /wd4146 /wd4127 /wd4710 /wd4711 /wd4820 $(CFLAGS)
 LTM_LDFLAGS = advapi32.lib
 
 #Libraries to be created (this makefile builds only static libraries)
@@ -60,7 +60,7 @@ $(OBJECTS): $(HEADERS)
 .c.obj:
 	$(CC) $(LTM_CFLAGS) /c $< /Fo$@
 
-#Create tomcrypt.lib
+#Create tommath.lib
 $(LIBMAIN_S): $(OBJECTS)
 	lib /out:$(LIBMAIN_S) $(OBJECTS)