diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2015-04-02 01:57:37 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2015-04-02 01:57:37 -0300 |
| commit | d880def0e9b5dcce07917aa7cc71e49bddf21c16 (patch) | |
| tree | d5f742c52db243d1098832669d1de78f574ccc0b /ProcessList.c | |
| parent | 4315e0c2a08b55e354d60225b8243ba1d3c6c309 (diff) | |
| parent | cb8ac6b0f1f456f94efc8aead597faf6a95788da (diff) | |
Merge branch 'master' into wip
Conflicts:
Process.c
Process.h
htop.c
linux/LinuxProcess.c
linux/LinuxProcess.h
test_spec.lua
Diffstat (limited to 'ProcessList.c')
| -rw-r--r-- | ProcessList.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ProcessList.c b/ProcessList.c index 229e370d..7fbe6c3a 100644 --- a/ProcessList.c +++ b/ProcessList.c @@ -287,7 +287,7 @@ void ProcessList_rebuildPanel(ProcessList* this) { } } -Process* ProcessList_getProcess(ProcessList* this, pid_t pid, bool* preExisting, Process_new_fn constructor) { +Process* ProcessList_getProcess(ProcessList* this, pid_t pid, bool* preExisting, Process_New constructor) { Process* proc = (Process*) Hashtable_get(this->processTable, pid); *preExisting = proc; if (proc) { |