Browse Source

Merge branch 'diamondo25-patch-2' into develop

Fix not defined warnings (-Wundef)
Karel Miko 8 years ago
parent
commit
617698e544
4 changed files with 4 additions and 4 deletions
  1. 1 1
      demos/constants.c
  2. 1 1
      demos/hashsum.c
  3. 1 1
      demos/sizes.c
  4. 1 1
      src/misc/hkdf/hkdf_test.c

+ 1 - 1
demos/constants.c

@@ -8,7 +8,7 @@
  */
 #include "tomcrypt.h"
 
-#if _POSIX_C_SOURCE >= 200112L
+#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L
 #include <libgen.h>
 #else
 #define basename(x) x

+ 1 - 1
demos/hashsum.c

@@ -18,7 +18,7 @@
 
 #include <tomcrypt.h>
 
-#if _POSIX_C_SOURCE >= 200112L
+#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L
 #include <libgen.h>
 #else
 #define basename(x) x

+ 1 - 1
demos/sizes.c

@@ -9,7 +9,7 @@
 
 #include "tomcrypt.h"
 
-#if _POSIX_C_SOURCE >= 200112L
+#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L
 #include <libgen.h>
 #else
 #define basename(x) x

+ 1 - 1
src/misc/hkdf/hkdf_test.c

@@ -265,7 +265,7 @@ int hkdf_test(void)
                         cases[i].info, cases[i].info_l,
                         cases[i].IKM,   cases[i].IKM_l,
                         OKM, cases[i].OKM_l)) != CRYPT_OK) {
-#if LTC_TEST_DBG > 1
+#if defined(LTC_TEST_DBG) && (LTC_TEST_DBG > 1)
             printf("LTC_HKDF-%s test #%d, %s\n", cases[i].Hash, i, error_to_string(err));
 #endif
             return err;