From 2ea57bf7898b91ab65464b718ff3679ed4541e96 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Wed, 19 Jan 2011 16:58:58 +0000
Subject: [PATCH] [ASM] Add include guards to asm.inc and comment out broken
 ljmp macro

svn path=/trunk/; revision=50438
---
 reactos/include/reactos/asm.inc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/reactos/include/reactos/asm.inc b/reactos/include/reactos/asm.inc
index 4274221fc19..45c9068abf4 100644
--- a/reactos/include/reactos/asm.inc
+++ b/reactos/include/reactos/asm.inc
@@ -5,6 +5,8 @@
  * PURPOSE:         ASM macros for for GAS and MASM/ML64
  * PROGRAMMERS:     Timo Kreuzer (timo.kreuzer@reactos.org)
  */
+#ifndef _ASM_INC_
+#define _ASM_INC_
 
 #ifdef _USE_ML
 
@@ -53,10 +55,6 @@ ENDM
 
 #define lidt lidt fword ptr ds:
 
-ljmp MACRO segment, offset
-    DB 0
-ENDM
-
 .code64 MACRO
     .code
 ENDM
@@ -115,9 +113,9 @@ ENDM
 // FIXME
 ENDM
 
-ljmp MACRO segment, offset
+//ljmp MACRO segment, offset
 // FIXME
-ENDM
+//ENDM
 
 UNIMPLEMENTED MACRO name
 ENDM
@@ -176,9 +174,9 @@ ENDM
 #define REPEAT .rept
 #define ENDR .endr
 
-.macro ljmp segment, offset
-    jmp far ptr \segment:\offset
-.endm
+//.macro ljmp segment, offset
+//    jmp far ptr \segment:\offset
+//.endm
 
 /* MASM compatible EXTERN */
 .macro EXTERN name
@@ -260,3 +258,5 @@ code = 1
 #define elseif .elseif
 
 #endif
+
+#endif /* _ASM_INC_ */