code.vuplus.com Git - vuplus_openembedded/blob - recipes/maemo4/libosso/libosso-buildfix.patch

   1 Index: libosso-2.13/src/osso-hw.c
   2 ===================================================================
   3 --- libosso-2.13.orig/src/osso-hw.c     2008-02-13 12:55:17.000000000 +0100
   4 +++ libosso-2.13/src/osso-hw.c  2008-02-13 13:02:55.000000000 +0100
   5 @@ -23,6 +23,9 @@
   6   * 02110-1301 USA
   7   */
   8
   9 +#define _GNU_SOURCE
  10 +#include <string.h>
  11 +
  12  #include "osso-internal.h"
  13  #include "osso-hw.h"
  14  #include "osso-mem.h"
  15 @@ -635,7 +638,7 @@
  16      (*cb)((muali_context_t*)osso, &info, data->user_data);
  17
  18      if (info.args != NULL) {
  19 -            free(info.args);
  20 +            free((void *) info.args);
  21              info.args = NULL;
  22      }
  23  }
  24 @@ -762,7 +765,7 @@
  25          (*cb)((muali_context_t*)osso, &info, data->user_data);
  26
  27          if (info.args != NULL) {
  28 -                free(info.args);
  29 +                free((void *) info.args);
  30                  info.args = NULL;
  31          }
  32  }
  33 Index: libosso-2.13/src/osso-rpc.c
  34 ===================================================================
  35 --- libosso-2.13.orig/src/osso-rpc.c    2008-02-13 13:03:13.000000000 +0100
  36 +++ libosso-2.13/src/osso-rpc.c 2008-02-13 13:06:05.000000000 +0100
  37 @@ -997,7 +997,8 @@
  38                  int *serial)
  39  {
  40          int i;
  41 -        char buf[20], *p;
  42 +        char buf[20];
  43 +        const char *p;
  44
  45          /* get bus type */
  46          for (i = 0, p = id; *p != ','; ++p, ++i) {
  47 @@ -1101,7 +1102,7 @@
  48          (*cb)((muali_context_t*)osso, &info, cb_data->user_data);
  49
  50          if (info.args != NULL) {
  51 -                free(info.args);
  52 +                free((void *) info.args);
  53                  info.args = NULL;
  54          }
  55  }
  56 @@ -1410,7 +1411,7 @@
  57          cb_data->message_id = (long)msg_serial;
  58
  59          cb_data->user_cb = reply_handler;
  60 -        cb_data->user_data = user_data;
  61 +        cb_data->user_data = (void *) user_data;
  62          cb_data->match_rule = NULL;
  63          cb_data->event_type = 0;
  64          cb_data->bus_type = bus_type;