From fc7438181b058d181bafcf350446fb3a77cb9445 Mon Sep 17 00:00:00 2001
From: Erik van der Kouwe <erik@minix3.org>
Date: Thu, 27 May 2010 09:18:49 +0000
Subject: [PATCH] Avoid use of C++ reserved word class in headers (reported by
 Aki Goto, tracker item 375)

---
 commands/service/service.c | 2 +-
 lib/csu/i386/crtso.S       | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/commands/service/service.c b/commands/service/service.c
index 4acbc7415..8ff08c2c8 100644
--- a/commands/service/service.c
+++ b/commands/service/service.c
@@ -692,7 +692,7 @@ PRIVATE void do_pci_class(config_t *cpe)
 			fatal("do_pci_class: too many class IDs (max %d)",
 				RS_NR_PCI_CLASS);
 		}
-		rs_start.rss_pci_class[rs_start.rss_nr_pci_class].class=
+		rs_start.rss_pci_class[rs_start.rss_nr_pci_class].pciclass=
 			class_id;
 		rs_start.rss_pci_class[rs_start.rss_nr_pci_class].mask= mask;
 		rs_start.rss_nr_pci_class++;
diff --git a/lib/csu/i386/crtso.S b/lib/csu/i386/crtso.S
index 4bc54928c..599d49966 100644
--- a/lib/csu/i386/crtso.S
+++ b/lib/csu/i386/crtso.S
@@ -23,7 +23,7 @@ begdata:
 .bss
 begbss:
 
-.globl	crtso, __penviron, __penvp, __fpu_present
+.globl	crtso, __penviron, __penvp
 .globl __minix_datastart, __minix_mainjump, __minix_unmapzero
 .extern	_main, _exit
 
@@ -61,11 +61,6 @@ crtso:
 	push	%edx	/* push argv */
 	push	%eax	/* push argc */
 
-/* Test the EM bit of the MSW to determine if an FPU is present and */
-/* set __fpu_present if one is found. */
-	smsw	%ax
-	testb	$0x4, %al	/* EM bit in MSW */
-	sete	__fpu_present	/* True if not set */
 	jmp	__minix_mainjump
 
 .balign I386_PAGE_SIZE
@@ -116,6 +111,5 @@ __penviron:
 
 .bss
 .lcomm	__penvp, 4	/* Hidden environment vector */
-.lcomm	__fpu_present, 4	/* FPU present flag */
 
 .extern	endtext	/* Force loading of end labels. */