aboutsummaryrefslogtreecommitdiffstats
path: root/libSYS
diff options
context:
space:
mode:
Diffstat (limited to 'libSYS')
-rw-r--r--libSYS/include/genericStds.h2
-rw-r--r--libSYS/include/machine_type.h2
-rw-r--r--libSYS/src/cmdl_parser.cpp3
3 files changed, 6 insertions, 1 deletions
diff --git a/libSYS/include/genericStds.h b/libSYS/include/genericStds.h
index 756935b..2d6eea6 100644
--- a/libSYS/include/genericStds.h
+++ b/libSYS/include/genericStds.h
@@ -96,6 +96,8 @@ amm-info@iis.fraunhofer.de
#include "machine_type.h"
+/* Work around for broken android toolchain: sys/types.h:137: error: 'uint64_t' does not name a type */
+#define _SYS_TYPES_H_
/* Always increase verbosity of memory allocation in case of a debug built. DEBUG is defined globally in that case. */
diff --git a/libSYS/include/machine_type.h b/libSYS/include/machine_type.h
index d04a8e8..b5642b2 100644
--- a/libSYS/include/machine_type.h
+++ b/libSYS/include/machine_type.h
@@ -173,7 +173,7 @@ amm-info@iis.fraunhofer.de
/* Define 64 bit base integer type. */
-#ifdef _MSC_VER
+#ifdef _WIN32
typedef __int64 INT64;
typedef unsigned __int64 UINT64;
#else
diff --git a/libSYS/src/cmdl_parser.cpp b/libSYS/src/cmdl_parser.cpp
index bf020ee..a93a2f4 100644
--- a/libSYS/src/cmdl_parser.cpp
+++ b/libSYS/src/cmdl_parser.cpp
@@ -92,6 +92,9 @@ amm-info@iis.fraunhofer.de
#define _CRT_SECURE_NO_WARNINGS
+/* Work around for broken android toolchain: sys/types.h:137: error: 'uint64_t' does not name a type */
+#define _SYS_TYPES_H_
+
#include <stdarg.h>
#include <stdio.h>
#include <string.h>