diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-20 22:30:35 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-20 22:30:35 +0000 |
| commit | acbc9e4a9400371c6c6f3828df7633afcda12ff9 (patch) | |
| tree | f5208f9de58e8c5fd86d0a61d217c398b6d9b86b | |
| parent | d10b8593d5daa3ecc3b12cff3f1345b2746935c5 (diff) | |
| parent | 938173f0be9772396145c05f7ad86d34d68283d0 (diff) | |
| download | ms-tpm-20-ref-acbc9e4a9400371c6c6f3828df7633afcda12ff9.tar.gz | |
Snap for 10448490 from 938173f0be9772396145c05f7ad86d34d68283d0 to simpleperf-release
Change-Id: I7c9291b494d11ca86fe3c7fef05f4c9370556c78
| -rw-r--r-- | Android.bp | 5 | ||||
| -rw-r--r-- | TPMCmd/Simulator/src/TPMCmdp.c | 2 | ||||
| -rw-r--r-- | TPMCmd/Simulator/src/TPMCmds.c | 2 | ||||
| -rw-r--r-- | TPMCmd/Simulator/src/TcpServer.c | 2 |
4 files changed, 8 insertions, 3 deletions
@@ -74,6 +74,11 @@ cc_defaults { "-Wno-unused-parameter", "-Wno-typedef-redefinition", ], + target: { + darwin: { + enabled: true, + }, + }, } cc_library_static { diff --git a/TPMCmd/Simulator/src/TPMCmdp.c b/TPMCmd/Simulator/src/TPMCmdp.c index 6e5c22b..fb93b24 100644 --- a/TPMCmd/Simulator/src/TPMCmdp.c +++ b/TPMCmd/Simulator/src/TPMCmdp.c @@ -48,7 +48,7 @@ # include <windows.h>
# include <winsock.h>
# pragma warning(pop)
-#elif defined(__unix__)
+#elif defined(__unix__) || __APPLE__
# include "BaseTypes.h" // on behalf of TpmFail_fp.h
typedef int SOCKET;
#else
diff --git a/TPMCmd/Simulator/src/TPMCmds.c b/TPMCmd/Simulator/src/TPMCmds.c index ade1c23..9a88af4 100644 --- a/TPMCmd/Simulator/src/TPMCmds.c +++ b/TPMCmd/Simulator/src/TPMCmds.c @@ -50,7 +50,7 @@ # include <windows.h>
# include <winsock.h>
# pragma warning(pop)
-#elif defined(__unix__)
+#elif defined(__unix__) || __APPLE__
# define _strcmpi strcasecmp
typedef int SOCKET;
#else
diff --git a/TPMCmd/Simulator/src/TcpServer.c b/TPMCmd/Simulator/src/TcpServer.c index 5adb90a..b57475d 100644 --- a/TPMCmd/Simulator/src/TcpServer.c +++ b/TPMCmd/Simulator/src/TcpServer.c @@ -48,7 +48,7 @@ # include <winsock.h>
# pragma warning(pop)
typedef int socklen_t;
-#elif defined(__unix__)
+#elif defined(__unix__) || __APPLE__
# include <string.h>
# include <unistd.h>
# include <errno.h>
|