diff options
author | djm <> | 2009-01-09 12:15:52 +0000 |
---|---|---|
committer | djm <> | 2009-01-09 12:15:52 +0000 |
commit | 23f8d96f0f508b8bef2602049feee9c44228d34c (patch) | |
tree | a2a7787bc00e8f6a29153b8c6d9eb5e8f73d6269 /src/lib/libcrypto/objects/obj_dat.pl | |
parent | 30562050421d947c3eb3c10edde6e87730b17471 (diff) | |
download | openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.tar.gz openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.tar.bz2 openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.zip |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/objects/obj_dat.pl')
-rw-r--r-- | src/lib/libcrypto/objects/obj_dat.pl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libcrypto/objects/obj_dat.pl b/src/lib/libcrypto/objects/obj_dat.pl index 8a09a46ee6..7de2f77afd 100644 --- a/src/lib/libcrypto/objects/obj_dat.pl +++ b/src/lib/libcrypto/objects/obj_dat.pl | |||
@@ -2,7 +2,9 @@ | |||
2 | 2 | ||
3 | # fixes bug in floating point emulation on sparc64 when | 3 | # fixes bug in floating point emulation on sparc64 when |
4 | # this script produces off-by-one output on sparc64 | 4 | # this script produces off-by-one output on sparc64 |
5 | use integer; | 5 | eval 'use integer;'; |
6 | |||
7 | print STDERR "Warning: perl module integer not found.\n" if ($@); | ||
6 | 8 | ||
7 | sub obj_cmp | 9 | sub obj_cmp |
8 | { | 10 | { |