summaryrefslogtreecommitdiff
path: root/sdk/recipes/patches/openssl/m68k-unknown-amigaos
diff options
context:
space:
mode:
Diffstat (limited to 'sdk/recipes/patches/openssl/m68k-unknown-amigaos')
-rw-r--r--sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.apps.c.p19
-rw-r--r--sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p4
2 files changed, 11 insertions, 12 deletions
diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.apps.c.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.apps.c.p
index 3f3a4ec..25afe8f 100644
--- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.apps.c.p
+++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.apps.c.p
@@ -1,16 +1,15 @@
--- apps.c 2014-10-15 13:53:39.000000000 +0100
+++ apps/apps.c 2015-01-05 21:02:13.650018727 +0000
-@@ -3009,9 +3009,11 @@ double app_tminterval(int stop,int usert
- struct rusage rus;
- struct timeval now;
- static struct timeval tmstart;
+@@ -2872,11 +2872,12 @@ double app_tminterval(int stop,int usert
+ struct rusage rus;
+ struct timeval now;
+ static struct timeval tmstart;
-
+#if !defined(OPENSSL_SYS_AMIGAOS3)
- if (usertime) getrusage(RUSAGE_SELF,&rus), now = rus.ru_utime;
-- else gettimeofday(&now,NULL);
-+ else
+ if (usertime)
+ getrusage(RUSAGE_SELF, &rus), now = rus.ru_utime;
+ else
+#endif
-+ gettimeofday(&now,NULL);
+ gettimeofday(&now, NULL);
- if (stop==TM_START) tmstart = now;
- else ret = ( (now.tv_sec+now.tv_usec*1e-6)
+ if (stop == TM_START)
diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p
index 337dc87..b83f0dd 100644
--- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p
+++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p
@@ -12,9 +12,9 @@
+
#ifdef TERMIOS
# include <termios.h>
- # define TTY_STRUCT struct termios
+ # define TTY_STRUCT struct termios
@@ -268,7 +274,7 @@
- typedef int sig_atomic_t;
+ typedef int sig_atomic_t;
#endif
-#if defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(MAC_OS_GUSI_SOURCE) || defined(OPENSSL_SYS_NETWARE)