merge in nyc-release history after reset to master
diff --git a/Global.h b/Global.h
index b1963d4..057fa89 100644
--- a/Global.h
+++ b/Global.h
@@ -12,7 +12,9 @@
#include "Tpm.h"
#include "TPMB.h"
#include "CryptoEngine.h"
+#ifndef EMBEDDED_MODE
#include <setjmp.h>
+#endif
//
//
//
@@ -1179,7 +1181,9 @@
// occurred. This address value isn't useful for anything other than helping the vendor to know in which file
// the failure occurred.
//
+#ifndef EMBEDDED_MODE
extern jmp_buf g_jumpBuffer; // the jump buffer
+#endif
extern BOOL g_inFailureMode; // Indicates that the TPM is in failure mode
extern BOOL g_forceFailureMode; // flag to force failure mode during test
#if defined TPM_FAIL_C || defined GLOBAL_C || 1
diff --git a/TPMCmdp.c b/TPMCmdp.c
index 492ea7c..a6ba991 100644
--- a/TPMCmdp.c
+++ b/TPMCmdp.c
@@ -9,7 +9,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <stdint.h>
-#include <setjmp.h>
#include "bool.h"
#include "Platform.h"
#include "ExecCommand_fp.h"
