Fix warnings: g_fopen() needs <glib/gstdio.h>.

[libsigrok.git] / sigrok-proto.h

diff --git a/sigrok-proto.h b/sigrok-proto.h
index 12665fea21bf4992dfc857cf5eecd810c38363fb..57b899df16ac36c894cec77773ce6e8601a88af8 100644 (file)
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -50,6 +50,7 @@ void device_probe_name(struct sr_device *device, int probenum, char *name);
 
 void device_trigger_clear(struct sr_device *device);
 void device_trigger_set(struct sr_device *device, int probenum, char *trigger);
+gboolean device_has_hwcap(struct sr_device *device, int hwcap);
 
 /*--- filter.c --------------------------------------------------------------*/
 
@@ -70,9 +71,11 @@ struct sr_device_instance *sr_get_device_instance(GSList *device_instances,
 void sr_device_instance_free(struct sr_device_instance *sdi);
 
 /* USB-specific instances */
+#ifdef HAVE_LIBUSB_1_0
 struct sr_usb_device_instance *sr_usb_device_instance_new(uint8_t bus,
                uint8_t address, struct libusb_device_handle *hdl);
 void sr_usb_device_instance_free(struct sr_usb_device_instance *usb);
+#endif
 
 /* Serial-specific instances */
 struct sr_serial_device_instance *sr_serial_device_instance_new(
@@ -94,7 +97,7 @@ typedef void (*datafeed_callback) (struct sr_device *device,
                                 struct sr_datafeed_packet *packet);
 
 /* Session setup */
-struct session *session_load(const char *filename);
+int session_load(const char *filename);
 struct session *session_new(void);
 void session_destroy(void);
 void session_device_clear(void);