Advertisement
Guest User

Untitled

a guest
Jul 28th, 2017
69
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.93 KB | None | 0 0
  1. svinhufvud /u/9/hjhniemi/os-project-shm/trunk/buenos > svn diff
  2. Index: proc/process.h
  3. ===================================================================
  4. --- proc/process.h (revision 60)
  5. +++ proc/process.h (working copy)
  6. @@ -37,6 +37,18 @@
  7. #ifndef BUENOS_PROC_PROCESS
  8. #define BUENOS_PROC_PROCESS
  9.  
  10. +#ifdef CHANGED_2
  11. +
  12. +#include "kernel/thread.h"
  13. +
  14. +typedef struct process_table {
  15. + thread_table_t * thread;
  16. +} process_table_t;
  17. +
  18. +void process_table_init(void);
  19. +
  20. +#endif // CHANGED_2
  21. +
  22. typedef int process_id_t;
  23.  
  24. void process_start(const char *executable);
  25. Index: Makefile
  26. ===================================================================
  27. --- Makefile (revision 60)
  28. +++ Makefile (working copy)
  29. @@ -39,7 +39,7 @@
  30.  
  31. ## User configurable variables
  32. MODULES := init kernel lib drivers proc vm fs net util kernel_tests
  33. -CHANGEDFLAGS := -DCHANGED_1 # -DCHANGED_2 -DCHANGED_3 -DCHANGED_4 -DCHANGED_5
  34. +CHANGEDFLAGS := -DCHANGED_1 -DCHANGED_2 # -DCHANGED_3 -DCHANGED_4 -DCHANGED_5
  35. PHASE := 1
  36.  
  37. ## Below this point, you shouldn't have to change anything.
  38. svinhufvud /u/9/hjhniemi/os-project-shm/trunk/buenos > gmake
  39. 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
  40. mips-elf-gcc -o init/main.o -g -G0 -O2 -I. -Wall -W -Werror -DCHANGED_1 -DCHANGED_2 -c init/main.c
  41. In file included from ./kernel/thread.h:43,
  42. from ./kernel/semaphore.h:41,
  43. from ./drivers/gbd.h:42,
  44. from ./fs/vfs.h:40,
  45. from init/main.c:43:
  46. ./proc/process.h:45: error: syntax error before "thread_table_t"
  47. ./proc/process.h:45: warning: no semicolon at end of struct or union
  48. ./proc/process.h:46: warning: type defaults to `int' in declaration of `process_table_t'
  49. ./proc/process.h:46: warning: data definition has no type or storage class
  50. gmake: *** [init/main.o] Error 1
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement