https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c5efed7da4716980ca678576bbf994e908c7228
commit 9c5efed7da4716980ca678576bbf994e908c7228
Author: Daniel Victor <ilauncherdevelo...@gmail.com>
AuthorDate: Fri Feb 28 17:39:13 2025 -0300
Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-ma...@reactos.org>
CommitDate: Sun Mar 2 19:09:46 2025 +0100
[ASM] Move `OFF(x)` macro from `asmxtras.inc` to `asm.inc`
---
sdk/include/asm/asm.inc | 6 ++++++
subsystems/mvdm/dos/asmxtras.inc | 7 -------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/sdk/include/asm/asm.inc b/sdk/include/asm/asm.inc
index 062b622619b..d5e4bc98818 100644
--- a/sdk/include/asm/asm.inc
+++ b/sdk/include/asm/asm.inc
@@ -172,6 +172,9 @@ ENDM
.skip size, fill
ENDM
+/* OFFset macro */
+#define OFF(x) offset x
+
#define lXdtPrefix fword ptr
ljmp MACRO segment, offset
@@ -324,6 +327,9 @@ ENDM
#define REPEAT .rept
#define ENDR .endr
+/* OFFset macro */
+#define OFF(x) x
+
#define lXdtPrefix
.macro ljmp segment, offset
diff --git a/subsystems/mvdm/dos/asmxtras.inc b/subsystems/mvdm/dos/asmxtras.inc
index e9b97e9e07c..a02fbc892c8 100644
--- a/subsystems/mvdm/dos/asmxtras.inc
+++ b/subsystems/mvdm/dos/asmxtras.inc
@@ -27,13 +27,6 @@
#define DWORD long
#endif
-/* OFFset macro */
-#ifdef _USE_ML
- #define OFF(x) offset x
-#else
- #define OFF(x) x
-#endif
-
/*
* Set of macros for defining and using structures:
* - STRUCT(name, ...) defines a structure of name 'name'.
