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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-07-16 17:14:45 +0300 (Mon, 16 Jul 2007)
New Revision: 12749

Modified:
   projects/haf/trunk/libosso/configure
   projects/haf/trunk/libosso/configure.ac
   projects/haf/trunk/libosso/debian/changelog
   projects/haf/trunk/libosso/debian/rules
   projects/haf/trunk/libosso/src/osso-rpc.c
Log:
added _GNU_SOURCE to configure.ac


Modified: projects/haf/trunk/libosso/configure
===================================================================
--- projects/haf/trunk/libosso/configure	2007-07-16 13:57:21 UTC (rev 12748)
+++ projects/haf/trunk/libosso/configure	2007-07-16 14:14:45 UTC (rev 12749)
@@ -2048,9 +2048,9 @@
 #define LIBOSSO_DEBUG 1
 _ACEOF
 
-    OSSO_CFLAGS="-g -ansi -D_BSD_SOURCE -rdynamic $WFLAGS"
+    OSSO_CFLAGS="-g -ansi -D_BSD_SOURCE -D_GNU_SOURCE -rdynamic $WFLAGS"
 else
-    OSSO_CFLAGS="-g -ansi -D_BSD_SOURCE -O2 -rdynamic $WFLAGS"
+    OSSO_CFLAGS="-g -ansi -D_BSD_SOURCE -D_GNU_SOURCE -O2 -rdynamic $WFLAGS"
 fi
 
 

Modified: projects/haf/trunk/libosso/configure.ac
===================================================================
--- projects/haf/trunk/libosso/configure.ac	2007-07-16 13:57:21 UTC (rev 12748)
+++ projects/haf/trunk/libosso/configure.ac	2007-07-16 14:14:45 UTC (rev 12749)
@@ -45,9 +45,9 @@
 WFLAGS="-Wall -Wmissing-prototypes -std=c99"
 if test x${libosso_use_debug} = xyes ; then
     AC_DEFINE([LIBOSSO_DEBUG],1,[Build extra debug code])
-    OSSO_CFLAGS="-g -ansi -D_BSD_SOURCE -rdynamic $WFLAGS"
+    OSSO_CFLAGS="-g -ansi -D_BSD_SOURCE -D_GNU_SOURCE -rdynamic $WFLAGS"
 else
-    OSSO_CFLAGS="-g -ansi -D_BSD_SOURCE -O2 -rdynamic $WFLAGS"
+    OSSO_CFLAGS="-g -ansi -D_BSD_SOURCE -D_GNU_SOURCE -O2 -rdynamic $WFLAGS"
 fi
 
 AC_SUBST([OSSO_CFLAGS])

Modified: projects/haf/trunk/libosso/debian/changelog
===================================================================
--- projects/haf/trunk/libosso/debian/changelog	2007-07-16 13:57:21 UTC (rev 12748)
+++ projects/haf/trunk/libosso/debian/changelog	2007-07-16 14:14:45 UTC (rev 12749)
@@ -3,6 +3,7 @@
   * Added some thread safety.
   * Removed -Werror from compilation options.
   * Added MCE_CFLAGS and MCE_LIBS to Makefile.am.
+  * Fixed some compilation warnings pointed out by Richard Hult.
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 16 Jul 2007 15:17:41 +0300
 

Modified: projects/haf/trunk/libosso/debian/rules
===================================================================
--- projects/haf/trunk/libosso/debian/rules	2007-07-16 13:57:21 UTC (rev 12748)
+++ projects/haf/trunk/libosso/debian/rules	2007-07-16 14:14:45 UTC (rev 12749)
@@ -11,7 +11,7 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CFLAGS += -Wall -g -ansi -Wshadow -D_GNU_SOURCE
+CFLAGS += -Wall -g -ansi -Wshadow
 CFLAGS += -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 # Use soft-float and thumb mode if it is enabled.
 CFLAGS += $(if $(findstring thumb,$(DEB_BUILD_OPTIONS)),-mthumb)

Modified: projects/haf/trunk/libosso/src/osso-rpc.c
===================================================================
--- projects/haf/trunk/libosso/src/osso-rpc.c	2007-07-16 13:57:21 UTC (rev 12748)
+++ projects/haf/trunk/libosso/src/osso-rpc.c	2007-07-16 14:14:45 UTC (rev 12749)
@@ -1380,7 +1380,7 @@
         cb_data->message_id = (long)msg_serial;
 
         cb_data->user_cb = reply_handler;
-        cb_data->user_data = user_data;
+        cb_data->user_data = (gpointer)user_data;
         cb_data->match_rule = NULL;
         cb_data->event_type = 0;
         cb_data->bus_type = bus_type;