Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit89e2a95

Browse files
committed
Fix some pgcrypto portability issues, per Marko Kreen.
1 parent9b55632 commit89e2a95

File tree

2 files changed

+11
-22
lines changed

2 files changed

+11
-22
lines changed

‎contrib/pgcrypto/imath.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Name: imath.c
44
Purpose: Arbitrary precision integer arithmetic routines.
55
Author: M. J. Fromberger <http://www.dartmouth.edu/~sting/>
6-
Info: $Id: imath.c,v 1.1 2006/07/13 04:15:24 neilc Exp $
6+
Info: $Id: imath.c,v 1.2 2006/07/1515:27:14 tgl Exp $
77
88
Copyright (C) 2002 Michael J. Fromberger, All Rights Reserved.
99
@@ -33,7 +33,7 @@
3333
#include"imath.h"
3434

3535
#undef assert
36-
#defineassert(TEST)
36+
#defineassert(TEST) Assert(TEST)
3737
#defineTRACEABLE_CLAMP 0
3838
#defineTRACEABLE_FREE 0
3939

‎contrib/pgcrypto/imath.h‎

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Name: imath.h
33
Purpose: Arbitrary precision integer arithmetic routines.
44
Author: M. J. Fromberger <http://www.dartmouth.edu/~sting/>
5-
Info: $Id: imath.h,v 1.1 2006/07/13 04:15:24 neilc Exp $
5+
Info: $Id: imath.h,v 1.2 2006/07/1515:27:14 tgl Exp $
66
77
Copyright (C) 2002 Michael J. Fromberger, All Rights Reserved.
88
@@ -39,11 +39,15 @@ typedef unsigned char mp_sign;
3939
typedefunsignedintmp_size;
4040
typedefintmp_result;
4141
#ifdefUSE_LONG_LONG
42-
typedefunsignedintmp_digit;
43-
typedefunsigned long longmp_word;
42+
typedefuint32mp_digit;
43+
typedefuint64mp_word;
44+
#defineMP_DIGIT_MAX 0xFFFFFFFFULL
45+
#defineMP_WORD_MAX 0xFFFFFFFFFFFFFFFFULL
4446
#else
45-
typedefunsigned shortmp_digit;
46-
typedefunsignedintmp_word;
47+
typedefuint16mp_digit;
48+
typedefuint32mp_word;
49+
#defineMP_DIGIT_MAX 0xFFFFUL
50+
#defineMP_WORD_MAX 0xFFFFFFFFUL
4751
#endif
4852

4953
typedefstructmpz {
@@ -70,21 +74,6 @@ extern const mp_result MP_BADARG;
7074
#defineMP_DIGIT_BIT (sizeof(mp_digit) * CHAR_BIT)
7175
#defineMP_WORD_BIT (sizeof(mp_word) * CHAR_BIT)
7276

73-
#ifdefUSE_LONG_LONG
74-
# ifndefULONG_LONG_MAX
75-
# ifdefULLONG_MAX
76-
# defineULONG_LONG_MAX ULLONG_MAX
77-
# else
78-
# error "Maximum value of unsigned long long not defined!"
79-
# endif
80-
# endif
81-
# defineMP_DIGIT_MAX (ULONG_MAX * 1ULL)
82-
# defineMP_WORD_MAX ULONG_LONG_MAX
83-
#else
84-
# defineMP_DIGIT_MAX (USHRT_MAX * 1UL)
85-
# defineMP_WORD_MAX (UINT_MAX * 1UL)
86-
#endif
87-
8877
#defineMP_MIN_RADIX 2
8978
#defineMP_MAX_RADIX 36
9079

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp