You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

41 lines
1.2 KiB

  1. From 40eb9ce75518817762a0eac4a93016ab817add89 Mon Sep 17 00:00:00 2001
  2. From: Lee Duncan <lduncan@suse.com>
  3. Date: Sat, 1 Feb 2020 10:23:04 -0800
  4. Subject: [PATCH] Fix 586 compile issue and remove -Werror
  5. Using -Werror causes any issue to break the build, whereas
  6. I'd rather let the build continue and address the issue.
  7. Also, fixed one signed-vs-unsigned compare for time_t, which
  8. shows up only on 586 (32-bit).
  9. ---
  10. configure.ac | 2 +-
  11. isnsdd.c | 2 +-
  12. 2 files changed, 2 insertions(+), 2 deletions(-)
  13. diff --git a/configure.ac b/configure.ac
  14. index e4f3995..d956e58 100644
  15. --- a/configure.ac
  16. +++ b/configure.ac
  17. @@ -17,7 +17,7 @@ AC_PATH_PROG(SH, sh)
  18. dnl C Compiler features
  19. AC_C_INLINE
  20. if test "$GCC" = "yes"; then
  21. - CFLAGS="-Wall -Werror -Wextra $CFLAGS"
  22. + CFLAGS="-Wall -Wextra $CFLAGS"
  23. CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
  24. fi
  25. diff --git a/isnsdd.c b/isnsdd.c
  26. index 58825cc..9cedb9f 100644
  27. --- a/isnsdd.c
  28. +++ b/isnsdd.c
  29. @@ -401,7 +401,7 @@ check_portal_registration(__attribute__((unused))void *ptr)
  30. continue;
  31. last_modified = isns_object_last_modified(obj);
  32. - if (last_modified + 2 * interval > now) {
  33. + if ((time_t)(last_modified + 2 * interval) > now) {
  34. good_portals++;
  35. continue;
  36. }