[maemo-commits] [maemo-commits] r19454 - in projects/haf/trunk/libosso: debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-10-16 16:10:58 +0300 (Fri, 16 Oct 2009)
New Revision: 19454

Modified:
   projects/haf/trunk/libosso/debian/changelog
   projects/haf/trunk/libosso/src/osso-init.c
   projects/haf/trunk/libosso/src/osso-rpc.c
Log:
  Kirtika Ruchandani:
  * Don't have inline for hidden functions.
  * Fixes: MB#4594
  * Fixes: NB#131747


Modified: projects/haf/trunk/libosso/debian/changelog
===================================================================
--- projects/haf/trunk/libosso/debian/changelog	2009-10-16 10:39:07 UTC (rev 19453)
+++ projects/haf/trunk/libosso/debian/changelog	2009-10-16 13:10:58 UTC (rev 19454)
@@ -1,8 +1,11 @@
-libosso (2.25-1~unreleased) unstable; urgency=low
+libosso (2.25-1) unstable; urgency=low
 
-  * foo
+  Kirtika Ruchandani:
+  * Don't have inline for hidden functions.
+  * Fixes: MB#4594
+  * Fixes: NB#131747
 
- -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu,  6 Aug 2009 12:35:35 +0300
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 16 Oct 2009 15:55:31 +0300
 
 libosso (2.24-1) unstable; urgency=low
 

Modified: projects/haf/trunk/libosso/src/osso-init.c
===================================================================
--- projects/haf/trunk/libosso/src/osso-init.c	2009-10-16 10:39:07 UTC (rev 19453)
+++ projects/haf/trunk/libosso/src/osso-init.c	2009-10-16 13:10:58 UTC (rev 19454)
@@ -712,7 +712,8 @@
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 
-inline int __attribute__ ((visibility("hidden")))
+/*Don't inline the functions, it breaks build on gcc 4.3.x*/
+int __attribute__ ((visibility("hidden")))
 muali_convert_msgtype(int t)
 {
     switch (t) {

Modified: projects/haf/trunk/libosso/src/osso-rpc.c
===================================================================
--- projects/haf/trunk/libosso/src/osso-rpc.c	2009-10-16 10:39:07 UTC (rev 19453)
+++ projects/haf/trunk/libosso/src/osso-rpc.c	2009-10-16 13:10:58 UTC (rev 19454)
@@ -992,7 +992,7 @@
  * muali = maemo user application library
  ******************************************************/
 
-inline void __attribute__ ((visibility("hidden")))
+void __attribute__ ((visibility("hidden")))
 _muali_parse_id(const char *id, muali_bus_type *bus, char *sender,
                 int *serial)
 {
@@ -1026,7 +1026,8 @@
         *serial = atoi(buf);
 }
 
-inline void __attribute__ ((visibility("hidden")))
+/*Don't inline functions, it breaks build on gcc 4.3.x*/
+void __attribute__ ((visibility("hidden")))
 _muali_make_id(muali_bus_type bus, const char *sender, int serial, char *id)
 {
         snprintf(id, MAX_MSGID_LEN, "%d,%s,%d", bus, sender, serial);