Browse Source

Avoid namespace clashes

tags/v0.9.3
Michael Brown 17 years ago
parent
commit
200d92c76d
1 changed files with 10 additions and 10 deletions
  1. 10
    10
      src/arch/i386/include/multiboot.h

+ 10
- 10
src/arch/i386/include/multiboot.h View File

59
 } multiboot_header_t;
59
 } multiboot_header_t;
60
 
60
 
61
 /* The symbol table for a.out.  */
61
 /* The symbol table for a.out.  */
62
-typedef struct aout_symbol_table
62
+typedef struct multiboot_aout_symbol_table
63
 {
63
 {
64
   unsigned long tabsize;
64
   unsigned long tabsize;
65
   unsigned long strsize;
65
   unsigned long strsize;
66
   unsigned long addr;
66
   unsigned long addr;
67
   unsigned long reserved;
67
   unsigned long reserved;
68
-} aout_symbol_table_t;
68
+} multiboot_aout_symbol_table_t;
69
 
69
 
70
 /* The section header table for ELF.  */
70
 /* The section header table for ELF.  */
71
-typedef struct elf_section_header_table
71
+typedef struct multiboot_elf_section_header_table
72
 {
72
 {
73
   unsigned long num;
73
   unsigned long num;
74
   unsigned long size;
74
   unsigned long size;
75
   unsigned long addr;
75
   unsigned long addr;
76
   unsigned long shndx;
76
   unsigned long shndx;
77
-} elf_section_header_table_t;
77
+} multiboot_elf_section_header_table_t;
78
 
78
 
79
 /* The Multiboot information.  */
79
 /* The Multiboot information.  */
80
 typedef struct multiboot_info
80
 typedef struct multiboot_info
88
   unsigned long mods_addr;
88
   unsigned long mods_addr;
89
   union
89
   union
90
   {
90
   {
91
-    aout_symbol_table_t aout_sym;
92
-    elf_section_header_table_t elf_sec;
91
+    multiboot_aout_symbol_table_t aout_sym;
92
+    multiboot_elf_section_header_table_t elf_sec;
93
   } u;
93
   } u;
94
   unsigned long mmap_length;
94
   unsigned long mmap_length;
95
   unsigned long mmap_addr;
95
   unsigned long mmap_addr;
107
 } multiboot_info_t;
107
 } multiboot_info_t;
108
 
108
 
109
 /* The module structure.  */
109
 /* The module structure.  */
110
-typedef struct module
110
+typedef struct multiboot_module
111
 {
111
 {
112
   unsigned long mod_start;
112
   unsigned long mod_start;
113
   unsigned long mod_end;
113
   unsigned long mod_end;
114
   unsigned long string;
114
   unsigned long string;
115
   unsigned long reserved;
115
   unsigned long reserved;
116
-} module_t;
116
+} multiboot_module_t;
117
 
117
 
118
 /* The memory map. Be careful that the offset 0 is base_addr_low
118
 /* The memory map. Be careful that the offset 0 is base_addr_low
119
    but no size.  */
119
    but no size.  */
120
-typedef struct memory_map
120
+typedef struct multiboot_memory_map
121
 {
121
 {
122
   unsigned long size;
122
   unsigned long size;
123
   unsigned long base_addr_low;
123
   unsigned long base_addr_low;
125
   unsigned long length_low;
125
   unsigned long length_low;
126
   unsigned long length_high;
126
   unsigned long length_high;
127
   unsigned long type;
127
   unsigned long type;
128
-} memory_map_t;
128
+} multiboot_memory_map_t;
129
 
129
 
130
 #endif /* ! ASM */
130
 #endif /* ! ASM */
131
 
131
 

Loading…
Cancel
Save