thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

Fix build on Cygwin and MingW.

Browse Source
This commit is contained in:
Bram Moolenaar 2010-05-18 21:17:10 +02:00
parent 76e69cef0c
commit 4a9b19ace8
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/blowfish.c
View File

@ -41,7 +41,7 @@ static void bf_e_cblock __ARGS((char_u *block));
static int bf_check_tables __ARGS((uint32_t ipa[18], uint32_t sbi[4][256], uint32_t val)); static int bf_check_tables __ARGS((uint32_t ipa[18], uint32_t sbi[4][256], uint32_t val));
static int bf_self_test __ARGS((void)); static int bf_self_test __ARGS((void));
// Blowfish code /* Blowfish code */
static uint32_t pax[18]; static uint32_t pax[18];
static uint32_t ipa[18] = { static uint32_t ipa[18] = {
0x243f6a88u, 0x85a308d3u, 0x13198a2eu, 0x243f6a88u, 0x85a308d3u, 0x13198a2eu,
@ -470,8 +470,10 @@ typedef struct {
uint32_t keysum; uint32_t keysum;
} struct_bf_test_data; } struct_bf_test_data;
// Assert bf(password, plaintxt) is cryptxt. /*
// Assert csum(pax sbx(password)) is keysum. * Assert bf(password, plaintxt) is cryptxt.
* Assert csum(pax sbx(password)) is keysum.
*/
static struct_bf_test_data bf_test_data[] = { static struct_bf_test_data bf_test_data[] = {
{ {
"password", "password",

12
src/vim.h
View File

@ -1980,6 +1980,12 @@ typedef int VimClipboard; /* This is required for the prototypes. */
#endif #endif
#if !defined(HAVE_CONFIG_H) && !defined(uint32_t) \
&& (defined(__CYGWIN32__) || defined(__MINGW32__))
/* Assuming that MingW and Cygwin do not typedef uint32_t. */
# define uint32_t unsigned int
#endif
/* ISSYMLINK(mode) tests if a file is a symbolic link. */ /* ISSYMLINK(mode) tests if a file is a symbolic link. */
#if (defined(S_IFMT) && defined(S_IFLNK)) || defined(S_ISLNK) #if (defined(S_IFMT) && defined(S_IFLNK)) || defined(S_ISLNK)
# define HAVE_ISSYMLINK # define HAVE_ISSYMLINK
@ -2067,9 +2073,9 @@ typedef int VimClipboard; /* This is required for the prototypes. */
/* uint32_t may be defined by configure, but perh.h may indirectly include /* uint32_t may be defined by configure, but perh.h may indirectly include
* stdint.h which tries to typedef uint32_t and fails. */ * stdint.h which tries to typedef uint32_t and fails. */
#ifdef uint32_t # ifdef uint32_t
# undef uint32_t # undef uint32_t
#endif # endif
# ifdef __BORLANDC__ # ifdef __BORLANDC__
/* Borland has the structure stati64 but not _stati64 */ /* Borland has the structure stati64 but not _stati64 */