diff options
| author | Andy Fiddaman <andy@omniosce.org> | 2017-11-16 16:18:58 -0500 |
|---|---|---|
| committer | Gordon Ross <gwr@nexenta.com> | 2017-11-17 07:10:52 -0500 |
| commit | 9dca21df58d57c2dadfa3bcb1d33c7bd0260cfd8 (patch) | |
| tree | 0e4083f47113fa7af401cde95b07d97098878588 | |
| parent | b14715fcd76b149c1fa0e1137cd516631ca5f295 (diff) | |
| download | illumos-joyent-9dca21df58d57c2dadfa3bcb1d33c7bd0260cfd8.tar.gz | |
8807 More recent glib updates break hald build
Reviewed by: Dan McDonald <danmcd@joyent.com>
Reviewed by: Yuri Pankov <yuripv@gmx.com>
Approved by: Gordon Ross <gwr@nexenta.com>
| -rw-r--r-- | usr/src/cmd/hal/hald/device.c | 2 | ||||
| -rw-r--r-- | usr/src/cmd/hal/hald/device_store.c | 4 | ||||
| -rw-r--r-- | usr/src/cmd/hal/hald/hald_marshal.list | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/usr/src/cmd/hal/hald/device.c b/usr/src/cmd/hal/hald/device.c index 44b90680ac..f0f45b357d 100644 --- a/usr/src/cmd/hal/hald/device.c +++ b/usr/src/cmd/hal/hald/device.c @@ -93,7 +93,7 @@ hal_device_class_init (HalDeviceClass *klass) G_STRUCT_OFFSET (HalDeviceClass, property_changed), NULL, NULL, - hald_marshal_VOID__STRING_BOOL_BOOL, + hald_marshal_VOID__STRING_BOOLEAN_BOOLEAN, G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_BOOLEAN, diff --git a/usr/src/cmd/hal/hald/device_store.c b/usr/src/cmd/hal/hald/device_store.c index d11cf6ed1b..8d2bc4cf18 100644 --- a/usr/src/cmd/hal/hald/device_store.c +++ b/usr/src/cmd/hal/hald/device_store.c @@ -73,7 +73,7 @@ hal_device_store_class_init (HalDeviceStoreClass *klass) G_STRUCT_OFFSET (HalDeviceStoreClass, store_changed), NULL, NULL, - hald_marshal_VOID__OBJECT_BOOL, + hald_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, 2, G_TYPE_OBJECT, G_TYPE_BOOLEAN); @@ -85,7 +85,7 @@ hal_device_store_class_init (HalDeviceStoreClass *klass) G_STRUCT_OFFSET (HalDeviceStoreClass, device_property_changed), NULL, NULL, - hald_marshal_VOID__OBJECT_STRING_BOOL_BOOL, + hald_marshal_VOID__OBJECT_STRING_BOOLEAN_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_OBJECT, G_TYPE_STRING, diff --git a/usr/src/cmd/hal/hald/hald_marshal.list b/usr/src/cmd/hal/hald/hald_marshal.list index 8e3863a85c..f7e28c76e9 100644 --- a/usr/src/cmd/hal/hald/hald_marshal.list +++ b/usr/src/cmd/hal/hald/hald_marshal.list @@ -1,6 +1,6 @@ -VOID:STRING,BOOL,BOOL +VOID:STRING,BOOLEAN,BOOLEAN VOID:STRING -VOID:OBJECT,BOOL -VOID:OBJECT,STRING,BOOL,BOOL +VOID:OBJECT,BOOLEAN +VOID:OBJECT,STRING,BOOLEAN,BOOLEAN VOID:OBJECT,STRING VOID:VOID |