Changeset 58702 in vbox

Timestamp:

Nov 16, 2015 4:22:39 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

104129

Message:

iprt/cdefs.h: Introduced RT_FAR_DATA for 16-bit code and adjusted RT_INLINE_ASM_EXTERNAL and RT_INLINE_ASM_GNU_STYLE for Watcom C/C++.

File:

• trunk/include/iprt/cdefs.h (modified) (3 diffs)

trunk/include/iprt/cdefs.h

@@ -2721 +2721 @@
  */
 #if (defined(_MSC_VER) && defined(RT_ARCH_AMD64)) \
- || (!defined(RT_ARCH_AMD64) && !defined(RT_ARCH_X86))
+ || (!defined(RT_ARCH_AMD64) && !defined(RT_ARCH_X86)) \
+ || defined(__WATCOMC__)
 # define RT_INLINE_ASM_EXTERNAL 1
 #else
@@ -2730 +2731 @@
  * Defined as 1 if the compiler understands GNU style inline assembly.
  */
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) || defined(__WATCOMC__)
 # define RT_INLINE_ASM_GNU_STYLE 0
 #else
@@ -2763 +2764 @@
 #elif defined(__GNUC__) && defined(__cplusplus)
 /* 4.5 or later, I think, if in ++11 mode... */
+#endif
+
+/** @def RT_FAR_DATA
+ * Set to 1 if we're in 16-bit mode and use far pointers.
+ */
+#if ARCH_BITS == 16 && defined(__WATCOMC__) \
+  && (defined(__COMPACT__) || defined(__LARGE__))
+# define RT_FAR_DATA 1
+#else
+# define RT_FAR_DATA 0
 #endif