sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Avoid use of C++ reserved word class in headers (reported by Aki Goto, tracker item 375)

Browse source
This commit is contained in:
Erik van der Kouwe 2010-05-27 09:18:49 +00:00
parent 43b589c1cc
commit fc7438181b
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
commands/service/service.c
View file

@ -692,7 +692,7 @@ PRIVATE void do_pci_class(config_t *cpe)
fatal("do_pci_class: too many class IDs (max %d)", fatal("do_pci_class: too many class IDs (max %d)",
RS_NR_PCI_CLASS); 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; class_id;
rs_start.rss_pci_class[rs_start.rss_nr_pci_class].mask= mask; rs_start.rss_pci_class[rs_start.rss_nr_pci_class].mask= mask;
rs_start.rss_nr_pci_class++; rs_start.rss_nr_pci_class++;

8
lib/csu/i386/crtso.S
View file

@ -23,7 +23,7 @@ begdata:
.bss .bss
begbss: begbss:
.globl crtso, __penviron, __penvp, __fpu_present .globl crtso, __penviron, __penvp
.globl __minix_datastart, __minix_mainjump, __minix_unmapzero .globl __minix_datastart, __minix_mainjump, __minix_unmapzero
.extern _main, _exit .extern _main, _exit
@ -61,11 +61,6 @@ crtso:
push %edx /* push argv */ push %edx /* push argv */
push %eax /* push argc */ 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 jmp __minix_mainjump
.balign I386_PAGE_SIZE .balign I386_PAGE_SIZE
@ -116,6 +111,5 @@ __penviron:
.bss .bss
.lcomm __penvp, 4 /* Hidden environment vector */ .lcomm __penvp, 4 /* Hidden environment vector */
.lcomm __fpu_present, 4 /* FPU present flag */
.extern endtext /* Force loading of end labels. */ .extern endtext /* Force loading of end labels. */