zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix GCC 4.3 issues: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=416852

This commit is contained in:
Hisham Muhammad 2007-08-10 05:59:36 +00:00
parent 4c51ad0e35
commit e685bdeea0
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Hashtable.h
View File

@ -47,13 +47,13 @@ Hashtable* Hashtable_new(int size, bool owner);
void Hashtable_delete(Hashtable* this); 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_put(Hashtable* this, unsigned int key, void* value);
void* Hashtable_remove(Hashtable* this, unsigned int key); 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); void Hashtable_foreach(Hashtable* this, Hashtable_PairFunction f, void* userData);

4
Panel.h
View File

@ -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); 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); void Panel_setEventHandler(Panel* this, Panel_EventHandler eh);

4
RichString.h
View File

@ -29,9 +29,9 @@ typedef struct RichString_ {
void RichString_write(RichString* this, int attrs, char* data); 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); void RichString_setAttr(RichString *this, int attrs);

2
ScreenManager.h
View File

@ -43,7 +43,7 @@ ScreenManager* ScreenManager_new(int x1, int y1, int x2, int y2, Orientation ori
void ScreenManager_delete(ScreenManager* this); 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); void ScreenManager_add(ScreenManager* this, Panel* item, FunctionBar* fuBar, int size);

6
String.h
View File

@ -19,9 +19,9 @@ in the source distribution for its full text.
#define String_startsWith(s, match) (strstr((s), (match)) == (s)) #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); char* String_cat(char* s1, char* s2);
@ -39,7 +39,7 @@ void String_printInt(int i);
void String_printPointer(void* p); 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); char** String_split(char* s, char sep);

4
UsersTable.h
View File

@ -30,8 +30,8 @@ void UsersTable_delete(UsersTable* this);
char* UsersTable_getRef(UsersTable* this, unsigned int uid); 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 #endif

6
Vector.h
View File

@ -61,15 +61,15 @@ void Vector_moveDown(Vector* this, int index);
void Vector_set(Vector* this, int index, void* data_); 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_merge(Vector* this, Vector* v2);
void Vector_add(Vector* this, void* data_); 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); void Vector_foreach(Vector* this, Vector_procedure f);

2
scripts/MakeHeader.py
View File

@ -54,7 +54,7 @@ for line in file.readlines():
elif equals != -1: elif equals != -1:
out.write("extern " + line[:equals] + ";" ) out.write("extern " + line[:equals] + ";" )
elif line[-1] == "{": elif line[-1] == "{":
out.write( line[:-2] + ";" ) out.write( line[:-2].replace("inline", "extern") + ";" )
state = SKIP state = SKIP
else: else:
out.write( line ) out.write( line )