diff options
| author | djm <> | 2006-06-27 05:07:03 +0000 |
|---|---|---|
| committer | djm <> | 2006-06-27 05:07:03 +0000 |
| commit | 7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d (patch) | |
| tree | 224c33f66b0b932c84dda315d9ba4236bf125b1c /src/lib/libcrypto/perlasm/x86asm.pl | |
| parent | 3f764f48d2626a43b6eeef7652c28303269d1204 (diff) | |
| download | openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.tar.gz openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.tar.bz2 openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/perlasm/x86asm.pl')
| -rw-r--r-- | src/lib/libcrypto/perlasm/x86asm.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/perlasm/x86asm.pl b/src/lib/libcrypto/perlasm/x86asm.pl index 60233f80e8..c3de90c65d 100644 --- a/src/lib/libcrypto/perlasm/x86asm.pl +++ b/src/lib/libcrypto/perlasm/x86asm.pl | |||
| @@ -96,7 +96,7 @@ $tmp | |||
| 96 | #ifdef OUT | 96 | #ifdef OUT |
| 97 | #define OK 1 | 97 | #define OK 1 |
| 98 | #define ALIGN 4 | 98 | #define ALIGN 4 |
| 99 | #if defined(__CYGWIN__) || defined(__DJGPP__) | 99 | #if defined(__CYGWIN__) || defined(__DJGPP__) || defined(__MINGW32__) |
| 100 | #undef SIZE | 100 | #undef SIZE |
| 101 | #undef TYPE | 101 | #undef TYPE |
| 102 | #define SIZE(a,b) | 102 | #define SIZE(a,b) |