diff options
| author | Brent Cook <bcook@openbsd.org> | 2018-11-07 20:00:29 -0600 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2018-11-07 20:04:11 -0600 |
| commit | 11bb39ecf6e58a5e44fc8043004b3f455f30b8fe (patch) | |
| tree | 9845ff5edbb4cc370bb5f0ab9c4787668bd46f07 /patches/aeadtest.c.patch | |
| parent | 34394e7ee024d2b88bed9c61b9a19bba6ec5e49e (diff) | |
| download | portable-11bb39ecf6e58a5e44fc8043004b3f455f30b8fe.tar.gz portable-11bb39ecf6e58a5e44fc8043004b3f455f30b8fe.tar.bz2 portable-11bb39ecf6e58a5e44fc8043004b3f455f30b8fe.zip | |
Rediffed patches for merge fuzz
Diffstat (limited to 'patches/aeadtest.c.patch')
| -rw-r--r-- | patches/aeadtest.c.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/aeadtest.c.patch b/patches/aeadtest.c.patch index 09838bc..a7b3fca 100644 --- a/patches/aeadtest.c.patch +++ b/patches/aeadtest.c.patch | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | --- tests/aeadtest.c.orig 2016-10-18 17:03:33.845870889 +0900 | 1 | --- tests/aeadtest.c.orig 2018-07-24 21:59:17.000000000 -0500 |
| 2 | +++ tests/aeadtest.c 2016-10-18 17:11:19.880841283 +0900 | 2 | +++ tests/aeadtest.c 2018-11-07 18:44:43.000000000 -0600 |
| 3 | @@ -76,6 +76,12 @@ | 3 | @@ -76,6 +76,12 @@ |
| 4 | 4 | ||
| 5 | #define BUF_MAX 1024 | 5 | #define BUF_MAX 1024 |
| 6 | 6 | ||
| 7 | +#ifdef _MSC_VER | 7 | +#ifdef _MSC_VER |
| 8 | +#ifdef IN | 8 | +#ifdef IN |
| 9 | +#undef IN | 9 | +#undef IN |