Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- svinhufvud /u/9/hjhniemi/os-project-shm/trunk/buenos > svn diff
- Index: proc/process.h
- ===================================================================
- --- proc/process.h (revision 60)
- +++ proc/process.h (working copy)
- @@ -37,6 +37,18 @@
- #ifndef BUENOS_PROC_PROCESS
- #define BUENOS_PROC_PROCESS
- +#ifdef CHANGED_2
- +
- +#include "kernel/thread.h"
- +
- +typedef struct process_table {
- + thread_table_t * thread;
- +} process_table_t;
- +
- +void process_table_init(void);
- +
- +#endif // CHANGED_2
- +
- typedef int process_id_t;
- void process_start(const char *executable);
- Index: Makefile
- ===================================================================
- --- Makefile (revision 60)
- +++ Makefile (working copy)
- @@ -39,7 +39,7 @@
- ## User configurable variables
- MODULES := init kernel lib drivers proc vm fs net util kernel_tests
- -CHANGEDFLAGS := -DCHANGED_1 # -DCHANGED_2 -DCHANGED_3 -DCHANGED_4 -DCHANGED_5
- +CHANGEDFLAGS := -DCHANGED_1 -DCHANGED_2 # -DCHANGED_3 -DCHANGED_4 -DCHANGED_5
- PHASE := 1
- ## Below this point, you shouldn't have to change anything.
- svinhufvud /u/9/hjhniemi/os-project-shm/trunk/buenos > gmake
- CC=mips-elf-gcc ./depend.sh `dirname proc/process` -g -G0 -O2 -I. -Wall -W -Werror -DCHANGED_1 -DCHANGED_2 proc/process.c >proc/process.d
- mips-elf-gcc -o init/main.o -g -G0 -O2 -I. -Wall -W -Werror -DCHANGED_1 -DCHANGED_2 -c init/main.c
- In file included from ./kernel/thread.h:43,
- from ./kernel/semaphore.h:41,
- from ./drivers/gbd.h:42,
- from ./fs/vfs.h:40,
- from init/main.c:43:
- ./proc/process.h:45: error: syntax error before "thread_table_t"
- ./proc/process.h:45: warning: no semicolon at end of struct or union
- ./proc/process.h:46: warning: type defaults to `int' in declaration of `process_table_t'
- ./proc/process.h:46: warning: data definition has no type or storage class
- gmake: *** [init/main.o] Error 1
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement