summaryrefslogtreecommitdiffstats
path: root/common/arch.h
diff options
context:
space:
mode:
authorJay Sorg <jay.sorg@gmail.com>2014-03-09 20:35:37 -0700
committerJay Sorg <jay.sorg@gmail.com>2014-03-09 20:35:37 -0700
commit5384e241f1e0d225c9439236ab3ba9364ad5b583 (patch)
tree9ef1ec0201a7a94f6b7bcde6876b1f68d8b2e52f /common/arch.h
parentef00f6653b47d92466412bb6a821c4d713b19e22 (diff)
parent0a2b3a2fd7e1e55cbc9afc2b26f5be5e63c511c0 (diff)
downloadxrdp-proprietary-5384e241f1e0d225c9439236ab3ba9364ad5b583.tar.gz
xrdp-proprietary-5384e241f1e0d225c9439236ab3ba9364ad5b583.zip
Merge branch 'master' of github.com:neutrinolabs/xrdp
Diffstat (limited to 'common/arch.h')
-rw-r--r--common/arch.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/common/arch.h b/common/arch.h
index 6a29b0a9..b4eb4719 100644
--- a/common/arch.h
+++ b/common/arch.h
@@ -32,6 +32,12 @@
defined(__AIX__) || defined(__PPC__) || defined(__mips__) || \
defined(__ia64__) || defined(__ppc__) || defined(__arm__)
#define NEED_ALIGN
+#elif defined(__x86__) || defined(__x86_64__) || \
+ defined(__AMD64__) || defined(_M_IX86) || \
+ defined(__i386__)
+#define NO_NEED_ALIGN
+#else
+#warning unknown arch
#endif
#endif
@@ -62,6 +68,8 @@
#define EXPORT_CC
#endif
+#ifndef DEFINED_Ts
+#define DEFINED_Ts
typedef char ti8;
typedef unsigned char tui8;
typedef signed char tsi8;
@@ -71,6 +79,7 @@ typedef signed short tsi16;
typedef int ti32;
typedef unsigned int tui32;
typedef signed int tsi32;
+typedef int tbool;
#if defined(_WIN64)
/* Microsoft's VC++ compiler uses the more backwards-compatible LLP64 model.
Most other 64 bit compilers(Solaris, AIX, HP, Linux, Mac OS X) use
@@ -94,5 +103,6 @@ typedef int tsock;
typedef unsigned long long tui64;
typedef signed long long tsi64;
#endif
+#endif /* DEFINED_Ts */
#endif