OS related include fixes

jens-maus · Dec 13, 2023 · acf537b · acf537b
1 parent fd02901
commit acf537b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/include/amissl/types.h b/include/amissl/types.h
@@ -5,7 +5,7 @@
 
  AmiSSL - OpenSSL wrapper for AmigaOS-based systems
  Copyright (c) 1999-2006 Andrija Antonijevic, Stefan Burstroem.
- Copyright (c) 2006-2022 AmiSSL Open Source Team.
+ Copyright (c) 2006-2023 AmiSSL Open Source Team.
  All Rights Reserved.
 
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,6 +37,7 @@ typedef unsigned char uint8_t;
 typedef unsigned short uint16_t;
 typedef unsigned int uint32_t;
 typedef long int off_t;
+typedef unsigned long uintptr_t;
 
 /* Cannot use 64-bit functions - used only to allow headers to be parsed */
 typedef int int64_t;

diff --git a/include/openssl/e_ostime.h b/include/openssl/e_ostime.h
@@ -35,6 +35,10 @@
 
 # if defined(OPENSSL_SYS_WINDOWS)
 #  include <winsock2.h>
+# elif defined(OPENSSL_SYS_AMIGA) && !defined(AMISSL_COMPILE) && \
+     ((defined(__amigaos4__) && defined(__USE_OLD_TIMEVAL__)) || \
+     (!defined(__amigaos4__) && !defined(__USE_NEW_TIMEVAL__)))
+#  include <devices/timer.h>
 # else
 #  include <sys/time.h>
 # endif

diff --git a/include/timeval.h b/include/timeval.h
@@ -5,7 +5,7 @@
 
  AmiSSL - OpenSSL wrapper for AmigaOS-based systems
  Copyright (c) 1999-2006 Andrija Antonijevic, Stefan Burstroem.
- Copyright (c) 2006-2022 AmiSSL Open Source Team.
+ Copyright (c) 2006-2023 AmiSSL Open Source Team.
  All Rights Reserved.
 
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,7 +28,7 @@
 // since the Amiga's timeval structure was renamed to
 // "struct TimeVal" in OS4 (to prevent clashes with the POSIX one)
 // we require to define that slightly compatible structure on our
-// own in case we compile YAM for something else than OS4 or in case
+// own in case we compile AmiSSL for something else than OS4 or in case
 // an older SDK is used.
 #if !defined(__amigaos4__) || !defined(__NEW_TIMEVAL_DEFINITION_USED__)
 #include <exec/io.h>

diff --git a/openssl/include/openssl/e_ostime.h b/openssl/include/openssl/e_ostime.h
@@ -23,6 +23,10 @@
 
 # if defined(OPENSSL_SYS_WINDOWS)
 #  include <winsock2.h>
+# elif defined(OPENSSL_SYS_AMIGA) && !defined(AMISSL_COMPILE) && \
+     ((defined(__amigaos4__) && defined(__USE_OLD_TIMEVAL__)) || \
+     (!defined(__amigaos4__) && !defined(__USE_NEW_TIMEVAL__)))
+#  include <devices/timer.h>
 # else
 #  include <sys/time.h>
 # endif