Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
htop
Commits
a92f8039
Commit
a92f8039
authored
Sep 10, 2015
by
Hisham Muhammad
Browse files
Merge pull request #268 from jweyrich/darwin-fixes
Darwin fixes - duplicate & conflicting decls
parents
229d0058
e52c070e
Changes
3
Show whitespace changes
Inline
Side-by-side
Process.h
View file @
a92f8039
...
@@ -158,8 +158,6 @@ typedef struct ProcessClass_ {
...
@@ -158,8 +158,6 @@ typedef struct ProcessClass_ {
#define ONE_DECIMAL_M (ONE_DECIMAL_K * ONE_DECIMAL_K)
#define ONE_DECIMAL_M (ONE_DECIMAL_K * ONE_DECIMAL_K)
#define ONE_DECIMAL_G (ONE_DECIMAL_M * ONE_DECIMAL_K)
#define ONE_DECIMAL_G (ONE_DECIMAL_M * ONE_DECIMAL_K)
extern
char
Process_pidFormat
[
20
];
void
Process_setupColumnWidths
();
void
Process_setupColumnWidths
();
void
Process_humanNumber
(
RichString
*
str
,
unsigned
long
number
,
bool
coloring
);
void
Process_humanNumber
(
RichString
*
str
,
unsigned
long
number
,
bool
coloring
);
...
...
darwin/Platform.c
View file @
a92f8039
...
@@ -81,7 +81,6 @@ void Platform_setBindings(Htop_Action* keys) {
...
@@ -81,7 +81,6 @@ void Platform_setBindings(Htop_Action* keys) {
}
}
int
Platform_numberOfFields
=
100
;
int
Platform_numberOfFields
=
100
;
char
*
Process_pidFormat
=
"%7u "
;
int
Platform_getUptime
()
{
int
Platform_getUptime
()
{
struct
timeval
bootTime
,
currTime
;
struct
timeval
bootTime
,
currTime
;
...
...
darwin/Platform.h
View file @
a92f8039
...
@@ -23,7 +23,6 @@ extern MeterClass* Platform_meterTypes[];
...
@@ -23,7 +23,6 @@ extern MeterClass* Platform_meterTypes[];
void
Platform_setBindings
(
Htop_Action
*
keys
);
void
Platform_setBindings
(
Htop_Action
*
keys
);
extern
int
Platform_numberOfFields
;
extern
int
Platform_numberOfFields
;
extern
char
*
Process_pidFormat
;
int
Platform_getUptime
();
int
Platform_getUptime
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment