summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2006-07-15 15:27:14 +0000
committerTom Lane2006-07-15 15:27:14 +0000
commit01956db7041aa4d384db04a1e7a7fa90e8f4385d (patch)
tree34ca73162616ecb8c72cd64451585194a3c39ebc
parent02b851395e2862bedf5f9b2559fda09785dfcc18 (diff)
Fix some pgcrypto portability issues, per Marko Kreen.
-rw-r--r--contrib/pgcrypto/imath.c2
-rw-r--r--contrib/pgcrypto/imath.h27
2 files changed, 9 insertions, 20 deletions
diff --git a/contrib/pgcrypto/imath.c b/contrib/pgcrypto/imath.c
index 873f58b77f..0545f8a495 100644
--- a/contrib/pgcrypto/imath.c
+++ b/contrib/pgcrypto/imath.c
@@ -33,7 +33,7 @@
#include "imath.h"
#undef assert
-#define assert(TEST)
+#define assert(TEST) Assert(TEST)
#define TRACEABLE_CLAMP 0
#define TRACEABLE_FREE 0
diff --git a/contrib/pgcrypto/imath.h b/contrib/pgcrypto/imath.h
index 95a1116fb3..cd220b831b 100644
--- a/contrib/pgcrypto/imath.h
+++ b/contrib/pgcrypto/imath.h
@@ -39,11 +39,15 @@ typedef unsigned char mp_sign;
typedef unsigned int mp_size;
typedef int mp_result;
#ifdef USE_LONG_LONG
-typedef unsigned int mp_digit;
-typedef unsigned long long mp_word;
+typedef uint32 mp_digit;
+typedef uint64 mp_word;
+#define MP_DIGIT_MAX 0xFFFFFFFFULL
+#define MP_WORD_MAX 0xFFFFFFFFFFFFFFFFULL
#else
-typedef unsigned short mp_digit;
-typedef unsigned int mp_word;
+typedef uint16 mp_digit;
+typedef uint32 mp_word;
+#define MP_DIGIT_MAX 0xFFFFUL
+#define MP_WORD_MAX 0xFFFFFFFFUL
#endif
typedef struct mpz {
@@ -70,21 +74,6 @@ extern const mp_result MP_BADARG;
#define MP_DIGIT_BIT (sizeof(mp_digit) * CHAR_BIT)
#define MP_WORD_BIT (sizeof(mp_word) * CHAR_BIT)
-#ifdef USE_LONG_LONG
-# ifndef ULONG_LONG_MAX
-# ifdef ULLONG_MAX
-# define ULONG_LONG_MAX ULLONG_MAX
-# else
-# error "Maximum value of unsigned long long not defined!"
-# endif
-# endif
-# define MP_DIGIT_MAX (ULONG_MAX * 1ULL)
-# define MP_WORD_MAX ULONG_LONG_MAX
-#else
-# define MP_DIGIT_MAX (USHRT_MAX * 1UL)
-# define MP_WORD_MAX (UINT_MAX * 1UL)
-#endif
-
#define MP_MIN_RADIX 2
#define MP_MAX_RADIX 36