summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2001-03-07 10:04:00 +0000
committerRichard Levitte <levitte@openssl.org>2001-03-07 10:04:00 +0000
commit70d70a3c81c7affbda6b626ff49097aa1714298c (patch)
treeb9bdbed59aab51d6455fd89f6fb95f8ceee8c355 /crypto
parentf1f25544e04ccf917a697b188a70ada5b09fc1a3 (diff)
Code for better build under Darwin (MacOS X).
Submitted by Brad Dominy <jdominy@darwinuser.org>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/bf/bf_opts.c2
-rw-r--r--crypto/bf/bfspeed.c2
-rw-r--r--crypto/bn/bnspeed.c2
-rw-r--r--crypto/bn/expspeed.c2
-rw-r--r--crypto/cast/cast_spd.c2
-rw-r--r--crypto/des/des_opts.c2
-rw-r--r--crypto/des/speed.c2
-rw-r--r--crypto/idea/idea_spd.c2
-rw-r--r--crypto/rc2/rc2speed.c2
-rw-r--r--crypto/rc4/rc4speed.c2
-rw-r--r--crypto/rc5/rc5speed.c2
-rw-r--r--crypto/tmdiff.c8
12 files changed, 13 insertions, 17 deletions
diff --git a/crypto/bf/bf_opts.c b/crypto/bf/bf_opts.c
index 99df5c303e..171dada2ca 100644
--- a/crypto/bf/bf_opts.c
+++ b/crypto/bf/bf_opts.c
@@ -59,7 +59,7 @@
/* define PART1, PART2, PART3 or PART4 to build only with a few of the options.
* This is for machines with 64k code segment size restrictions. */
-#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
+#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
#define TIMES
#endif
diff --git a/crypto/bf/bfspeed.c b/crypto/bf/bfspeed.c
index 5b2077b643..f346af64f3 100644
--- a/crypto/bf/bfspeed.c
+++ b/crypto/bf/bfspeed.c
@@ -59,7 +59,7 @@
/* 11-Sep-92 Andrew Daviel Support for Silicon Graphics IRIX added */
/* 06-Apr-92 Luke Brennan Support for VMS and add extra signal calls */
-#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
+#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
#define TIMES
#endif
diff --git a/crypto/bn/bnspeed.c b/crypto/bn/bnspeed.c
index 2c81667154..b554ac8cf8 100644
--- a/crypto/bn/bnspeed.c
+++ b/crypto/bn/bnspeed.c
@@ -71,7 +71,7 @@
#include <openssl/crypto.h>
#include <openssl/err.h>
-#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
+#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
#define TIMES
#endif
diff --git a/crypto/bn/expspeed.c b/crypto/bn/expspeed.c
index 91dc7ff9a7..07a1bcf51c 100644
--- a/crypto/bn/expspeed.c
+++ b/crypto/bn/expspeed.c
@@ -97,7 +97,7 @@ static void genprime_cb(int p, int n, void *arg);
#include <openssl/err.h>
#include <openssl/rand.h>
-#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
+#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
#define TIMES
#endif
diff --git a/crypto/cast/cast_spd.c b/crypto/cast/cast_spd.c
index 6e00b90f9d..76abf50d98 100644
--- a/crypto/cast/cast_spd.c
+++ b/crypto/cast/cast_spd.c
@@ -59,7 +59,7 @@
/* 11-Sep-92 Andrew Daviel Support for Silicon Graphics IRIX added */
/* 06-Apr-92 Luke Brennan Support for VMS and add extra signal calls */
-#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
+#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
#define TIMES
#endif
diff --git a/crypto/des/des_opts.c b/crypto/des/des_opts.c
index c1076757bb..b53ad3a96d 100644
--- a/crypto/des/des_opts.c
+++ b/crypto/des/des_opts.c
@@ -59,7 +59,7 @@
/* define PART1, PART2, PART3 or PART4 to build only with a few of the options.
* This is for machines with 64k code segment size restrictions. */
-#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
+#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
#define TIMES
#endif
diff --git a/crypto/des/speed.c b/crypto/des/speed.c
index 1c58b76d87..f211e7c3ef 100644
--- a/crypto/des/speed.c
+++ b/crypto/des/speed.c
@@ -59,7 +59,7 @@
/* 11-Sep-92 Andrew Daviel Support for Silicon Graphics IRIX added */
/* 06-Apr-92 Luke Brennan Support for VMS and add extra signal calls */
-#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
+#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
#define TIMES
#endif
diff --git a/crypto/idea/idea_spd.c b/crypto/idea/idea_spd.c
index 755c7d8b9b..48ffaff520 100644
--- a/crypto/idea/idea_spd.c
+++ b/crypto/idea/idea_spd.c
@@ -59,7 +59,7 @@
/* 11-Sep-92 Andrew Daviel Support for Silicon Graphics IRIX added */
/* 06-Apr-92 Luke Brennan Support for VMS and add extra signal calls */
-#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
+#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
#define TIMES
#endif
diff --git a/crypto/rc2/rc2speed.c b/crypto/rc2/rc2speed.c
index 866251e68b..47d34b444e 100644
--- a/crypto/rc2/rc2speed.c
+++ b/crypto/rc2/rc2speed.c
@@ -59,7 +59,7 @@
/* 11-Sep-92 Andrew Daviel Support for Silicon Graphics IRIX added */
/* 06-Apr-92 Luke Brennan Support for VMS and add extra signal calls */
-#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
+#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
#define TIMES
#endif
diff --git a/crypto/rc4/rc4speed.c b/crypto/rc4/rc4speed.c
index cea385178b..ced98c52df 100644
--- a/crypto/rc4/rc4speed.c
+++ b/crypto/rc4/rc4speed.c
@@ -59,7 +59,7 @@
/* 11-Sep-92 Andrew Daviel Support for Silicon Graphics IRIX added */
/* 06-Apr-92 Luke Brennan Support for VMS and add extra signal calls */
-#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
+#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
#define TIMES
#endif
diff --git a/crypto/rc5/rc5speed.c b/crypto/rc5/rc5speed.c
index c6b27255ae..7d490d5b77 100644
--- a/crypto/rc5/rc5speed.c
+++ b/crypto/rc5/rc5speed.c
@@ -59,7 +59,7 @@
/* 11-Sep-92 Andrew Daviel Support for Silicon Graphics IRIX added */
/* 06-Apr-92 Luke Brennan Support for VMS and add extra signal calls */
-#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
+#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
#define TIMES
#endif
diff --git a/crypto/tmdiff.c b/crypto/tmdiff.c
index 6d40bd7ef3..eccba43c0b 100644
--- a/crypto/tmdiff.c
+++ b/crypto/tmdiff.c
@@ -65,12 +65,8 @@
#undef TIMES
#endif
-#ifndef OPENSSL_SYS_MSDOS
-# ifndef OPENSSL_SYS_WIN32
-# if !defined(OPENSSL_SYS_VMS) || defined(__DECC)
-# define TIMES
-# endif
-# endif
+#if !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_SYS_VMS) || defined(__DECC) && !defined(OPENSSL_SYS_MACOSX)
+# define TIMES
#endif
#ifndef _IRIX
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 03:21:29 +0000