1 files changed, 11 insertions, 55 deletions
diff --git a/mobicore/MobiCoreDriverLib/ClientLib/public/GP/tee_type.h b/mobicore/MobiCoreDriverLib/ClientLib/public/GP/tee_type.h
index f164dab..cd8a630 100644
--- a/mobicore/MobiCoreDriverLib/ClientLib/public/GP/tee_type.h
+++ b/mobicore/MobiCoreDriverLib/ClientLib/public/GP/tee_type.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 TRUSTONIC LIMITED
+ * Copyright (c) 2013-2015 TRUSTONIC LIMITED
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,67 +28,16 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/**
- * Definition of the machine-specific integer types
- **/
+
+
 #ifndef __TEE_TYPE_H__
 #define __TEE_TYPE_H__
 
-/* C99 integer types */
-#if (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L) &&(!defined(ANDROID))
-
 #include <limits.h>
 
-/* Figure out if a 64-bit integer types is available */
-#if \
-    defined(_MSC_VER) || \
-    defined(__SYMBIAN32__) || \
-    defined(_WIN32_WCE) || \
-    (defined(ULLONG_MAX) && ULLONG_MAX == 0xFFFFFFFFFFFFFFFFULL) || \
-    (defined(ULONG_LONG_MAX) && ULONG_LONG_MAX == 0xFFFFFFFFFFFFFFFFULL)
-typedef unsigned long long uint64_t;
-typedef long long int64_t;
-#else
-#define __S_TYPE_INT64_UNDEFINED
-#endif
-
-#if UINT_MAX == 0xFFFFFFFF
-typedef unsigned int uint32_t;
-typedef int int32_t;
-#elif ULONG_MAX == 0xFFFFFFFF
-typedef unsigned long uint32_t;
-typedef long int32_t;
-#else
-#error This compiler is not supported.
-#endif
-
-#if USHRT_MAX == 0xFFFF
-typedef unsigned short uint16_t;
-typedef short  int16_t;
-#else
-#error This compiler is not supported.
-#endif
-
-#if UCHAR_MAX == 0xFF
-typedef unsigned char uint8_t;
-typedef signed char   int8_t;
-#else
-#error This compiler is not supported.
-#endif
-
-#if !defined(__cplusplus)
-typedef unsigned char bool;
-#define false ( (bool)0 )
-#define true  ( (bool)1 )
-#endif
-
-#else  /* !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L */
-
 #include <stdbool.h>
 #include <stdint.h>
 
-#endif  /* !(!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L) */
-
 #include <stddef.h>
 
 #ifndef NULL
@@ -113,4 +62,11 @@ typedef struct TEE_UUID {
 } TEE_UUID;
 typedef TEE_UUID TEEC_UUID;
 
-#endif /* __TEE_TYPE_H__ */
+/** Type definition for a TEE Identity */
+typedef struct TEE_Identity {
+    uint32_t login;
+    TEE_UUID uuid;
+} TEE_Identity;
+
+#endif /* __TEE_CLIENT_TYPES_H__ */
+