From 7cccf542f9a1f6d6d25e0b8a6db11c58530a0a61 Mon Sep 17 00:00:00 2001
From: Kevin O'Connor <kevin@koconnor.net>
Date: Fri, 2 Jan 2009 23:35:23 -0500
Subject: Don't define bda as a macro in resume.c - it confuses AVOIDCOMBINE
 mode.

When using AVOIDCOMBINE, macros can have global scope.  This caused
    the bda macro in resume.c to conflict with the bda variable in
    post.c.
---
 src/resume.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/resume.c b/src/resume.c
index 4ff3133..2100383 100644
--- a/src/resume.c
+++ b/src/resume.c
@@ -33,6 +33,7 @@ handle_resume(u8 status)
     debug_serial_setup();
     dprintf(1, "In resume (status=%d)\n", status);
 
+    struct bios_data_area_s *bda = MAKE_FARPTR(SEG_BDA, 0);
     switch (status) {
     case 0xfe:
         // S3 resume request.  Jump to 32bit mode to handle the resume.
@@ -60,7 +61,6 @@ handle_resume(u8 status)
         // NO BREAK
     case 0x0a:
         // resume execution by jump via 40h:0067h
-#define bda ((struct bios_data_area_s *)MAKE_FARPTR(SEG_BDA, 0))
         asm volatile(
             "movw %%ax, %%ds\n"
             "ljmpw *%0\n"
-- 
cgit v1.1