Print this page
8807 More recent glib updates break hald build
Reviewed by: Dan McDonald <danmcd@joyent.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/hal/hald/device_store.c
          +++ new/usr/src/cmd/hal/hald/device_store.c
↓ open down ↓ 65 lines elided ↑ open up ↑
  66   66  
  67   67          obj_class->finalize = hal_device_store_finalize;
  68   68  
  69   69          signals[STORE_CHANGED] =
  70   70                  g_signal_new ("store_changed",
  71   71                                G_TYPE_FROM_CLASS (klass),
  72   72                                G_SIGNAL_RUN_LAST,
  73   73                                G_STRUCT_OFFSET (HalDeviceStoreClass,
  74   74                                                 store_changed),
  75   75                                NULL, NULL,
  76      -                              hald_marshal_VOID__OBJECT_BOOL,
       76 +                              hald_marshal_VOID__OBJECT_BOOLEAN,
  77   77                                G_TYPE_NONE, 2,
  78   78                                G_TYPE_OBJECT,
  79   79                                G_TYPE_BOOLEAN);
  80   80  
  81   81          signals[DEVICE_PROPERTY_CHANGED] =
  82   82                  g_signal_new ("device_property_changed",
  83   83                                G_TYPE_FROM_CLASS (klass),
  84   84                                G_SIGNAL_RUN_LAST,
  85   85                                G_STRUCT_OFFSET (HalDeviceStoreClass,
  86   86                                                 device_property_changed),
  87   87                                NULL, NULL,
  88      -                              hald_marshal_VOID__OBJECT_STRING_BOOL_BOOL,
       88 +                              hald_marshal_VOID__OBJECT_STRING_BOOLEAN_BOOLEAN,
  89   89                                G_TYPE_NONE, 4,
  90   90                                G_TYPE_OBJECT,
  91   91                                G_TYPE_STRING,
  92   92                                G_TYPE_BOOLEAN,
  93   93                                G_TYPE_BOOLEAN);
  94   94  
  95   95          signals[DEVICE_CAPABILITY_ADDED] =
  96   96                  g_signal_new ("device_capability_added",
  97   97                                G_TYPE_FROM_CLASS (klass),
  98   98                                G_SIGNAL_RUN_LAST,
↓ open down ↓ 395 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX