diff options
| author | djm <> | 2010-10-01 22:59:01 +0000 |
|---|---|---|
| committer | djm <> | 2010-10-01 22:59:01 +0000 |
| commit | 8922d4bc4a8b8893d72a48deb2cdf58215f98505 (patch) | |
| tree | 939b752540947d33507b3acc48d76a8bfb7c3dc3 /src/lib/libcrypto/cast/asm | |
| parent | 76262f7bf9262f965142b1b2b2105cb279c5c696 (diff) | |
| download | openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.tar.gz openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.tar.bz2 openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.zip | |
resolve conflicts, fix local changes
Diffstat (limited to 'src/lib/libcrypto/cast/asm')
| -rw-r--r-- | src/lib/libcrypto/cast/asm/cast-586.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libcrypto/cast/asm/cast-586.pl b/src/lib/libcrypto/cast/asm/cast-586.pl index 0ed55d1905..7a0083ecb8 100644 --- a/src/lib/libcrypto/cast/asm/cast-586.pl +++ b/src/lib/libcrypto/cast/asm/cast-586.pl | |||
| @@ -3,7 +3,8 @@ | |||
| 3 | # define for pentium pro friendly version | 3 | # define for pentium pro friendly version |
| 4 | $ppro=1; | 4 | $ppro=1; |
| 5 | 5 | ||
| 6 | push(@INC,"perlasm","../../perlasm"); | 6 | $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; |
| 7 | push(@INC,"${dir}","${dir}../../perlasm"); | ||
| 7 | require "x86asm.pl"; | 8 | require "x86asm.pl"; |
| 8 | require "cbc.pl"; | 9 | require "cbc.pl"; |
| 9 | 10 | ||