diff options
author | Alexis211 <alexis211@gmail.com> | 2009-10-16 22:58:05 +0200 |
---|---|---|
committer | Alexis211 <alexis211@gmail.com> | 2009-10-16 22:58:05 +0200 |
commit | 54d76800cf8010434065556e12f693b101383d8b (patch) | |
tree | 5388f108f5a461fac83f593c19b85533f1a0e468 /Source/Kernel/TaskManager/Process.class.h | |
parent | 518d722a88a62d81150e54b8ae02be7176171ccf (diff) | |
parent | 4d5348a49f54d95c0271c8f9c4ef01c005d6b74b (diff) | |
download | Melon-54d76800cf8010434065556e12f693b101383d8b.tar.gz Melon-54d76800cf8010434065556e12f693b101383d8b.zip |
Merge branch 'heap_class'
Conflicts:
Source/Kernel/Melon.ke
Diffstat (limited to 'Source/Kernel/TaskManager/Process.class.h')
-rw-r--r-- | Source/Kernel/TaskManager/Process.class.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Kernel/TaskManager/Process.class.h b/Source/Kernel/TaskManager/Process.class.h index 65a5d8b..b975db1 100644 --- a/Source/Kernel/TaskManager/Process.class.h +++ b/Source/Kernel/TaskManager/Process.class.h @@ -3,6 +3,7 @@ #include <Library/String.class.h> #include <Library/Vector.class.h> +#include <Library/SimpleList.class.h> #include <MemoryManager/PageDirectory.class.h> #include <VTManager/VirtualTerminal.proto.h> @@ -35,7 +36,7 @@ class Process { VirtualTerminal *m_vt; Vector<Thread*> m_threads; - Vector<File*> m_fileDescriptors; + SimpleList<File*> *m_fileDescriptors; public: static Process* createKernel(String cmdline, VirtualTerminal *vt); //Also creates a Thread for what's curently happening |