diff options
| -rw-r--r-- | bin/bbackupquery/BackupQueries.cpp | 7 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | infrastructure/m4/ax_check_llong_minmax.m4 | 76 | ||||
| -rw-r--r-- | lib/win32/config.h.win32 | 6 |
4 files changed, 4 insertions, 86 deletions
diff --git a/bin/bbackupquery/BackupQueries.cpp b/bin/bbackupquery/BackupQueries.cpp index bf84ab98..b7207720 100644 --- a/bin/bbackupquery/BackupQueries.cpp +++ b/bin/bbackupquery/BackupQueries.cpp @@ -26,6 +26,7 @@ #endif #include <set> +#include <limits> #include "BackupQueries.h" #include "Utils.h" @@ -777,7 +778,7 @@ void BackupQueries::CommandGetObject(const std::vector<std::string> &args, const } int64_t id = ::strtoll(args[0].c_str(), 0, 16); - if(id == LLONG_MIN || id == LLONG_MAX || id == 0) + if(id == std::numeric_limits<long long>::min() || id == std::numeric_limits<long long>::max() || id == 0) { printf("Not a valid object ID (specified in hex)\n"); return; @@ -863,7 +864,7 @@ void BackupQueries::CommandGet(const std::vector<std::string> &args, const bool { // Specified as ID. id = ::strtoll(args[0].c_str(), 0, 16); - if(id == LLONG_MIN || id == LLONG_MAX || id == 0) + if(id == std::numeric_limits<long long>::min() || id == std::numeric_limits<long long>::max() || id == 0) { printf("Not a valid object ID (specified in hex)\n"); return; @@ -1733,7 +1734,7 @@ void BackupQueries::CommandRestore(const std::vector<std::string> &args, const b { // Specified as ID. dirID = ::strtoll(args[0].c_str(), 0, 16); - if(dirID == LLONG_MIN || dirID == LLONG_MAX || dirID == 0) + if(dirID == std::numeric_limits<long long>::min() || dirID == std::numeric_limits<long long>::max() || dirID == 0) { printf("Not a valid object ID (specified in hex)\n"); return; diff --git a/configure.ac b/configure.ac index 9a464f86..2c4300c7 100644 --- a/configure.ac +++ b/configure.ac @@ -120,7 +120,6 @@ AC_HEADER_TIME AC_STRUCT_TM AX_CHECK_DIRENT_D_TYPE AC_SYS_LARGEFILE -AX_CHECK_LLONG_MINMAX AX_CHECK_DEFINE_PRAGMA if test "x$ac_cv_c_bigendian" != "xyes"; then AX_BSWAP64 diff --git a/infrastructure/m4/ax_check_llong_minmax.m4 b/infrastructure/m4/ax_check_llong_minmax.m4 deleted file mode 100644 index f3f99c53..00000000 --- a/infrastructure/m4/ax_check_llong_minmax.m4 +++ /dev/null @@ -1,76 +0,0 @@ -dnl @synopsis AX_CHECK_LLONG_MINMAX -dnl -dnl This macro will fix up LLONG_MIN and LLONG_MAX as appropriate. I'm finding -dnl it quite difficult to believe that so many hoops are necessary. The world -dnl seems to have gone quite mad. -dnl -dnl This gem is adapted from the OpenSSH configure script so here's -dnl the original copyright notice: -dnl -dnl Copyright (c) 1999-2004 Damien Miller -dnl -dnl Permission to use, copy, modify, and distribute this software for any -dnl purpose with or without fee is hereby granted, provided that the above -dnl copyright notice and this permission notice appear in all copies. -dnl -dnl @category C -dnl @author Martin Ebourne and Damien Miller -dnl @version 2005/07/07 - -AC_DEFUN([AX_CHECK_LLONG_MINMAX], [ - AC_CHECK_DECL([LLONG_MAX], [have_llong_max=1], , [[#include <limits.h>]]) - if test -z "$have_llong_max"; then - AC_MSG_CHECKING([[for max value of long long]]) - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <stdio.h> - /* Why is this so damn hard? */ - #undef __GNUC__ - #undef __USE_ISOC99 - #define __USE_ISOC99 - #include <limits.h> - #define DATA "conftest.llminmax" - int main(void) { - FILE *f; - long long i, llmin, llmax = 0; - - if((f = fopen(DATA,"w")) == NULL) - exit(1); - - #if defined(LLONG_MIN) && defined(LLONG_MAX) - fprintf(stderr, "Using system header for LLONG_MIN and LLONG_MAX\n"); - llmin = LLONG_MIN; - llmax = LLONG_MAX; - #else - fprintf(stderr, "Calculating LLONG_MIN and LLONG_MAX\n"); - /* This will work on one's complement and two's complement */ - for (i = 1; i > llmax; i <<= 1, i++) - llmax = i; - llmin = llmax + 1LL; /* wrap */ - #endif - - /* Sanity check */ - if (llmin + 1 < llmin || llmin - 1 < llmin || llmax + 1 > llmax || llmax - 1 > llmax) { - fprintf(f, "unknown unknown\n"); - exit(2); - } - - if (fprintf(f ,"%lld %lld", llmin, llmax) < 0) - exit(3); - - exit(0); - } - ]])], [ - read llong_min llong_max < conftest.llminmax - AC_MSG_RESULT([$llong_max]) - AC_DEFINE_UNQUOTED([LLONG_MAX], [${llong_max}LL], - [max value of long long calculated by configure]) - AC_MSG_CHECKING([[for min value of long long]]) - AC_MSG_RESULT([$llong_min]) - AC_DEFINE_UNQUOTED([LLONG_MIN], [${llong_min}LL], - [min value of long long calculated by configure]) - ], - [AC_MSG_RESULT(not found)], - [AC_MSG_WARN([[cross compiling: not checking]])] - ) - fi - ])dnl diff --git a/lib/win32/config.h.win32 b/lib/win32/config.h.win32 index 42298545..edc44a75 100644 --- a/lib/win32/config.h.win32 +++ b/lib/win32/config.h.win32 @@ -318,12 +318,6 @@ /* Define to 1 if __syscall is available but needs a definition */ /* #undef HAVE___SYSCALL_NEED_DEFN */ -/* max value of long long calculated by configure */ -/* #undef LLONG_MAX */ - -/* min value of long long calculated by configure */ -/* #undef LLONG_MIN */ - /* Define to 1 if `lstat' dereferences a symlink specified with a trailing slash. */ /* #undef LSTAT_FOLLOWS_SLASHED_SYMLINK */ |