From e685bdeea080160684faaf17169faac0e614dfc7 Mon Sep 17 00:00:00 2001
From: Hisham Muhammad <hisham@gobolinux.org>
Date: Fri, 10 Aug 2007 05:59:36 +0000
Subject: Fix GCC 4.3 issues:
 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=416852

---
 Hashtable.h           | 4 ++--
 Panel.h               | 4 ++--
 RichString.h          | 4 ++--
 ScreenManager.h       | 2 +-
 String.h              | 6 +++---
 UsersTable.h          | 4 ++--
 Vector.h              | 6 +++---
 scripts/MakeHeader.py | 2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Hashtable.h b/Hashtable.h
index 21dfdcc6..4abd1333 100644
--- a/Hashtable.h
+++ b/Hashtable.h
@@ -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);
 
diff --git a/Panel.h b/Panel.h
index 512545b2..54e30877 100644
--- a/Panel.h
+++ b/Panel.h
@@ -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);
 
diff --git a/RichString.h b/RichString.h
index 1f486781..6972afec 100644
--- a/RichString.h
+++ b/RichString.h
@@ -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);
 
diff --git a/ScreenManager.h b/ScreenManager.h
index 416164c4..898da2f2 100644
--- a/ScreenManager.h
+++ b/ScreenManager.h
@@ -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);
 
diff --git a/String.h b/String.h
index 8f0b50b5..71e92faa 100644
--- a/String.h
+++ b/String.h
@@ -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);
 
diff --git a/UsersTable.h b/UsersTable.h
index 7f6740eb..b0d06fc3 100644
--- a/UsersTable.h
+++ b/UsersTable.h
@@ -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
diff --git a/Vector.h b/Vector.h
index 3ecfd270..209da0e5 100644
--- a/Vector.h
+++ b/Vector.h
@@ -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);
 
diff --git a/scripts/MakeHeader.py b/scripts/MakeHeader.py
index dd9d99d1..a84ae74b 100755
--- a/scripts/MakeHeader.py
+++ b/scripts/MakeHeader.py
@@ -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 )
-- 
cgit v1.2.3