Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
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
e685bdee
Commit
e685bdee
authored
17 years ago
by
Hisham Muhammad
Browse files
Options
Download
Email Patches
Plain Diff
Fix GCC 4.3 issues:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=416852
parent
4c51ad0e
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
Hashtable.h
+2
-2
Hashtable.h
Panel.h
+2
-2
Panel.h
RichString.h
+2
-2
RichString.h
ScreenManager.h
+1
-1
ScreenManager.h
String.h
+3
-3
String.h
UsersTable.h
+2
-2
UsersTable.h
Vector.h
+3
-3
Vector.h
scripts/MakeHeader.py
+1
-1
scripts/MakeHeader.py
with
16 additions
and
16 deletions
+16
-16
Hashtable.h
View file @
e685bdee
...
...
@@ -47,13 +47,13 @@ Hashtable* Hashtable_new(int size, bool owner);
void
Hashtable_delete
(
Hashtable
*
this
);
inline
int
Hashtable_size
(
Hashtable
*
this
);
extern
int
Hashtable_size
(
Hashtable
*
this
);
void
Hashtable_put
(
Hashtable
*
this
,
unsigned
int
key
,
void
*
value
);
void
*
Hashtable_remove
(
Hashtable
*
this
,
unsigned
int
key
);
inline
void
*
Hashtable_get
(
Hashtable
*
this
,
unsigned
int
key
);
extern
void
*
Hashtable_get
(
Hashtable
*
this
,
unsigned
int
key
);
void
Hashtable_foreach
(
Hashtable
*
this
,
Hashtable_PairFunction
f
,
void
*
userData
);
...
...
This diff is collapsed.
Click to expand it.
Panel.h
View file @
e685bdee
...
...
@@ -72,9 +72,9 @@ void Panel_init(Panel* this, int x, int y, int w, int h, char* type, bool owner)
void
Panel_done
(
Panel
*
this
);
inline
void
Panel_setRichHeader
(
Panel
*
this
,
RichString
header
);
extern
void
Panel_setRichHeader
(
Panel
*
this
,
RichString
header
);
inline
void
Panel_setHeader
(
Panel
*
this
,
char
*
header
);
extern
void
Panel_setHeader
(
Panel
*
this
,
char
*
header
);
void
Panel_setEventHandler
(
Panel
*
this
,
Panel_EventHandler
eh
);
...
...
This diff is collapsed.
Click to expand it.
RichString.h
View file @
e685bdee
...
...
@@ -29,9 +29,9 @@ typedef struct RichString_ {
void
RichString_write
(
RichString
*
this
,
int
attrs
,
char
*
data
);
inline
void
RichString_append
(
RichString
*
this
,
int
attrs
,
char
*
data
);
extern
void
RichString_append
(
RichString
*
this
,
int
attrs
,
char
*
data
);
inline
void
RichString_appendn
(
RichString
*
this
,
int
attrs
,
char
*
data
,
int
len
);
extern
void
RichString_appendn
(
RichString
*
this
,
int
attrs
,
char
*
data
,
int
len
);
void
RichString_setAttr
(
RichString
*
this
,
int
attrs
);
...
...
This diff is collapsed.
Click to expand it.
ScreenManager.h
View file @
e685bdee
...
...
@@ -43,7 +43,7 @@ ScreenManager* ScreenManager_new(int x1, int y1, int x2, int y2, Orientation ori
void
ScreenManager_delete
(
ScreenManager
*
this
);
inline
int
ScreenManager_size
(
ScreenManager
*
this
);
extern
int
ScreenManager_size
(
ScreenManager
*
this
);
void
ScreenManager_add
(
ScreenManager
*
this
,
Panel
*
item
,
FunctionBar
*
fuBar
,
int
size
);
...
...
This diff is collapsed.
Click to expand it.
String.h
View file @
e685bdee
...
...
@@ -19,9 +19,9 @@ in the source distribution for its full text.
#define String_startsWith(s, match) (strstr((s), (match)) == (s))
inline
void
String_delete
(
char
*
s
);
extern
void
String_delete
(
char
*
s
);
inline
char
*
String_copy
(
char
*
orig
);
extern
char
*
String_copy
(
char
*
orig
);
char
*
String_cat
(
char
*
s1
,
char
*
s2
);
...
...
@@ -39,7 +39,7 @@ void String_printInt(int i);
void
String_printPointer
(
void
*
p
);
inline
int
String_eq
(
const
char
*
s1
,
const
char
*
s2
);
extern
int
String_eq
(
const
char
*
s1
,
const
char
*
s2
);
char
**
String_split
(
char
*
s
,
char
sep
);
...
...
This diff is collapsed.
Click to expand it.
UsersTable.h
View file @
e685bdee
...
...
@@ -30,8 +30,8 @@ void UsersTable_delete(UsersTable* this);
char
*
UsersTable_getRef
(
UsersTable
*
this
,
unsigned
int
uid
);
inline
int
UsersTable_size
(
UsersTable
*
this
);
extern
int
UsersTable_size
(
UsersTable
*
this
);
inline
void
UsersTable_foreach
(
UsersTable
*
this
,
Hashtable_PairFunction
f
,
void
*
userData
);
extern
void
UsersTable_foreach
(
UsersTable
*
this
,
Hashtable_PairFunction
f
,
void
*
userData
);
#endif
This diff is collapsed.
Click to expand it.
Vector.h
View file @
e685bdee
...
...
@@ -61,15 +61,15 @@ void Vector_moveDown(Vector* this, int index);
void
Vector_set
(
Vector
*
this
,
int
index
,
void
*
data_
);
inline
Object
*
Vector_get
(
Vector
*
this
,
int
index
);
extern
Object
*
Vector_get
(
Vector
*
this
,
int
index
);
inline
int
Vector_size
(
Vector
*
this
);
extern
int
Vector_size
(
Vector
*
this
);
void
Vector_merge
(
Vector
*
this
,
Vector
*
v2
);
void
Vector_add
(
Vector
*
this
,
void
*
data_
);
inline
int
Vector_indexOf
(
Vector
*
this
,
void
*
search_
,
Object_Compare
compare
);
extern
int
Vector_indexOf
(
Vector
*
this
,
void
*
search_
,
Object_Compare
compare
);
void
Vector_foreach
(
Vector
*
this
,
Vector_procedure
f
);
...
...
This diff is collapsed.
Click to expand it.
scripts/MakeHeader.py
View file @
e685bdee
...
...
@@ -54,7 +54,7 @@ for line in file.readlines():
elif
equals
!=
-
1
:
out
.
write
(
"extern "
+
line
[:
equals
]
+
";"
)
elif
line
[
-
1
]
==
"{"
:
out
.
write
(
line
[:
-
2
]
+
";"
)
out
.
write
(
line
[:
-
2
]
.
replace
(
"inline"
,
"extern"
)
+
";"
)
state
=
SKIP
else
:
out
.
write
(
line
)
...
...
This diff is collapsed.
Click to expand it.
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
Menu
Projects
Groups
Snippets
Help