|
190 | 190 | * boundary. See crypto/rc4/rc4_enc.c for further details.
|
191 | 191 | */
|
192 | 192 | # undef RC4_CHUNK
|
193 |
| -# if (defined(_M_X64) || defined(__x86_64__)) && defined(_WIN32) |
| 193 | +# if defined(_M_X64) || defined(__x86_64__) |
194 | 194 | # define RC4_CHUNK unsigned long long
|
195 |
| -# elif (defined(_M_X64) || defined(__x86_64__)) && !defined(_WIN32) |
196 |
| -# define RC4_CHUNK unsigned long |
197 | 195 | # elif defined(__arm__)
|
198 | 196 | # define RC4_CHUNK unsigned long
|
199 | 197 | # else
|
|
205 | 203 | /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
|
206 | 204 | * %20 speed up (longs are 8 bytes, int's are 4). */
|
207 | 205 | # undef DES_LONG
|
208 |
| -# if defined(_M_X64) || defined(__x86_64__) || defined(__arm__) || defined(__mips__) |
209 |
| -# define DES_LONG unsigned int |
210 |
| -# elif defined(_M_IX86) || defined(__i386__) |
211 |
| -# define DES_LONG unsigned long |
212 |
| -# endif |
| 206 | +# define DES_LONG unsigned int |
213 | 207 | #endif
|
214 | 208 |
|
215 | 209 | #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
|
216 | 210 | # define CONFIG_HEADER_BN_H
|
217 | 211 |
|
218 |
| -# undef BL_LLONG |
219 |
| -# if defined(_M_IX86) || defined(__i386__) || defined(__arm__) |
220 |
| -# define BL_LLONG |
221 |
| -# endif |
222 |
| - |
223 | 212 | /* Should we define BN_DIV2W here? */
|
224 | 213 |
|
225 | 214 | /* Only one for the following should be defined */
|
|
231 | 220 | # undef THIRTY_TWO_BIT
|
232 | 221 | # undef SIXTEEN_BIT
|
233 | 222 | # undef EIGHT_BIT
|
234 |
| -# if (defined(_M_X64) || defined(__x86_64__)) && defined(_WIN32) |
235 |
| -# define SIXTY_FOUR_BIT |
236 |
| -# elif (defined(_M_X64) || defined(__x86_64__)) && !defined(_WIN32) |
237 |
| -# define SIXTY_FOUR_BIT_LONG |
| 223 | +# if defined(_M_X64) || defined(__x86_64__) |
| 224 | +# if defined(_WIN64) || defined(_LP64) |
| 225 | +# define SIXTY_FOUR_BIT_LONG |
| 226 | +# else |
| 227 | +# define SIXTY_FOUR_BIT |
| 228 | +# endif |
238 | 229 | # elif defined(_M_IX86) || defined(__i386__) || defined(__arm__) || defined(__mips__)
|
239 | 230 | # define THIRTY_TWO_BIT
|
240 | 231 | # endif
|
|
0 commit comments