replaced LIBUSB_API with LIBUSB_CALL

7 files changed, 124 insertions, 124 deletions

diff --git a/examples/dpfp.c b/examples/dpfp.c
index 04b42ed..af51e0f 100644
--- a/examples/dpfp.c
+++ b/examples/dpfp.c
@@ -149,7 +149,7 @@ static int set_mode(unsigned char data)
 	return 0;
 }
 
-static void LIBUSB_API cb_mode_changed(struct libusb_transfer *transfer)
+static void LIBUSB_CALL cb_mode_changed(struct libusb_transfer *transfer)
 {
 	if (transfer->status != LIBUSB_TRANSFER_COMPLETED) {
 		fprintf(stderr, "mode change transfer not completed!\n");
@@ -276,7 +276,7 @@ static int next_state(void)
 	return 0;
 }
 
-static void LIBUSB_API cb_irq(struct libusb_transfer *transfer)
+static void LIBUSB_CALL cb_irq(struct libusb_transfer *transfer)
 {
 	unsigned char irqtype = transfer->buffer[0];
 
@@ -315,7 +315,7 @@ static void LIBUSB_API cb_irq(struct libusb_transfer *transfer)
 		do_exit = 2;
 }
 
-static void LIBUSB_API cb_img(struct libusb_transfer *transfer)
+static void LIBUSB_CALL cb_img(struct libusb_transfer *transfer)
 {
 	if (transfer->status != LIBUSB_TRANSFER_COMPLETED) {
 		fprintf(stderr, "img transfer status %d?\n", transfer->status);
diff --git a/examples/dpfp_threaded.c b/examples/dpfp_threaded.c
index 54e5ae3..4641a50 100644
--- a/examples/dpfp_threaded.c
+++ b/examples/dpfp_threaded.c
@@ -178,7 +178,7 @@ static int set_mode(unsigned char data)
 	return 0;
 }
 
-static void LIBUSB_API cb_mode_changed(struct libusb_transfer *transfer)
+static void LIBUSB_CALL cb_mode_changed(struct libusb_transfer *transfer)
 {
 	if (transfer->status != LIBUSB_TRANSFER_COMPLETED) {
 		fprintf(stderr, "mode change transfer not completed!\n");
@@ -305,7 +305,7 @@ static int next_state(void)
 	return 0;
 }
 
-static void LIBUSB_API cb_irq(struct libusb_transfer *transfer)
+static void LIBUSB_CALL cb_irq(struct libusb_transfer *transfer)
 {
 	unsigned char irqtype = transfer->buffer[0];
 
@@ -343,7 +343,7 @@ static void LIBUSB_API cb_irq(struct libusb_transfer *transfer)
 		request_exit(2);
 }
 
-static void LIBUSB_API cb_img(struct libusb_transfer *transfer)
+static void LIBUSB_CALL cb_img(struct libusb_transfer *transfer)
 {
 	if (transfer->status != LIBUSB_TRANSFER_COMPLETED) {
 		fprintf(stderr, "img transfer status %d?\n", transfer->status);
diff --git a/libusb/core.c b/libusb/core.c
index 8fe4a09..fd44731 100644
--- a/libusb/core.c
+++ b/libusb/core.c
@@ -600,7 +600,7 @@ struct libusb_device *usbi_get_device_by_session_id(struct libusb_context *ctx,
  * \returns the number of devices in the outputted list, or LIBUSB_ERROR_NO_MEM
  * on memory allocation failure.
  */
-API_EXPORTED ssize_t LIBUSB_API libusb_get_device_list(libusb_context *ctx,
+API_EXPORTED ssize_t LIBUSB_CALL libusb_get_device_list(libusb_context *ctx,
 	libusb_device ***list)
 {
 	struct discovered_devs *discdevs = discovered_devs_alloc();
@@ -646,7 +646,7 @@ out:
  * \param list the list to free
  * \param unref_devices whether to unref the devices in the list
  */
-API_EXPORTED void LIBUSB_API libusb_free_device_list(libusb_device **list,
+API_EXPORTED void LIBUSB_CALL libusb_free_device_list(libusb_device **list,
 	int unref_devices)
 {
 	if (!list)
@@ -667,7 +667,7 @@ API_EXPORTED void LIBUSB_API libusb_free_device_list(libusb_device **list,
  * \param dev a device
  * \returns the bus number
  */
-API_EXPORTED uint8_t LIBUSB_API libusb_get_bus_number(libusb_device *dev)
+API_EXPORTED uint8_t LIBUSB_CALL libusb_get_bus_number(libusb_device *dev)
 {
 	return dev->bus_number;
 }
@@ -677,7 +677,7 @@ API_EXPORTED uint8_t LIBUSB_API libusb_get_bus_number(libusb_device *dev)
  * \param dev a device
  * \returns the device address
  */
-API_EXPORTED uint8_t LIBUSB_API libusb_get_device_address(libusb_device *dev)
+API_EXPORTED uint8_t LIBUSB_CALL libusb_get_device_address(libusb_device *dev)
 {
 	return dev->device_address;
 }
@@ -723,7 +723,7 @@ static const struct libusb_endpoint_descriptor *find_endpoint(
  * \returns LIBUSB_ERROR_NOT_FOUND if the endpoint does not exist
  * \returns LIBUSB_ERROR_OTHER on other failure
  */
-API_EXPORTED int LIBUSB_API libusb_get_max_packet_size(libusb_device *dev,
+API_EXPORTED int LIBUSB_CALL libusb_get_max_packet_size(libusb_device *dev,
 	unsigned char endpoint)
 {
 	struct libusb_config_descriptor *config;
@@ -772,7 +772,7 @@ API_EXPORTED int LIBUSB_API libusb_get_max_packet_size(libusb_device *dev,
  * \returns LIBUSB_ERROR_NOT_FOUND if the endpoint does not exist
  * \returns LIBUSB_ERROR_OTHER on other failure
  */
-API_EXPORTED int LIBUSB_API libusb_get_max_iso_packet_size(libusb_device *dev,
+API_EXPORTED int LIBUSB_CALL libusb_get_max_iso_packet_size(libusb_device *dev,
 	unsigned char endpoint)
 {
 	struct libusb_config_descriptor *config;
@@ -808,7 +808,7 @@ API_EXPORTED int LIBUSB_API libusb_get_max_iso_packet_size(libusb_device *dev,
  * \param dev the device to reference
  * \returns the same device
  */
-API_EXPORTED libusb_device* LIBUSB_API libusb_ref_device(libusb_device *dev)
+API_EXPORTED libusb_device* LIBUSB_CALL libusb_ref_device(libusb_device *dev)
 {
 	usbi_mutex_lock(&dev->lock);
 	dev->refcnt++;
@@ -821,7 +821,7 @@ API_EXPORTED libusb_device* LIBUSB_API libusb_ref_device(libusb_device *dev)
  * causes the reference count to reach zero, the device shall be destroyed.
  * \param dev the device to unreference
  */
-API_EXPORTED void LIBUSB_API libusb_unref_device(libusb_device *dev)
+API_EXPORTED void LIBUSB_CALL libusb_unref_device(libusb_device *dev)
 {
 	int refcnt;
 
@@ -910,7 +910,7 @@ void usbi_fd_notification(struct libusb_context *ctx)
  * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
  * \returns another LIBUSB_ERROR code on other failure
  */
-API_EXPORTED int LIBUSB_API libusb_open(libusb_device *dev, libusb_device_handle **handle)
+API_EXPORTED int LIBUSB_CALL libusb_open(libusb_device *dev, libusb_device_handle **handle)
 {
 	struct libusb_context *ctx = DEVICE_CTX(dev);
 	struct libusb_device_handle *_handle;
@@ -972,7 +972,7 @@ API_EXPORTED int LIBUSB_API libusb_open(libusb_device *dev, libusb_device_handle
  * \param product_id the idProduct value to search for
  * \returns a handle for the first found device, or NULL on error or if the
  * device could not be found. */
-API_EXPORTED libusb_device_handle* LIBUSB_API libusb_open_device_with_vid_pid(
+API_EXPORTED libusb_device_handle* LIBUSB_CALL libusb_open_device_with_vid_pid(
 	libusb_context *ctx, uint16_t vendor_id, uint16_t product_id)
 {
 	struct libusb_device **devs;
@@ -1031,7 +1031,7 @@ static void do_close(struct libusb_context *ctx,
  *
  * \param dev_handle the handle to close
  */
-API_EXPORTED void LIBUSB_API libusb_close(libusb_device_handle *dev_handle)
+API_EXPORTED void LIBUSB_CALL libusb_close(libusb_device_handle *dev_handle)
 {
 	struct libusb_context *ctx;
 	unsigned char dummy = 1;
@@ -1092,7 +1092,7 @@ API_EXPORTED void LIBUSB_API libusb_close(libusb_device_handle *dev_handle)
  * \param dev_handle a device handle
  * \returns the underlying device
  */
-API_EXPORTED libusb_device* LIBUSB_API libusb_get_device(libusb_device_handle *dev_handle)
+API_EXPORTED libusb_device* LIBUSB_CALL libusb_get_device(libusb_device_handle *dev_handle)
 {
 	return dev_handle->dev;
 }
@@ -1117,7 +1117,7 @@ API_EXPORTED libusb_device* LIBUSB_API libusb_get_device(libusb_device_handle *d
  * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
  * \returns another LIBUSB_ERROR code on other failure
  */
-API_EXPORTED int LIBUSB_API libusb_get_configuration(libusb_device_handle *dev,
+API_EXPORTED int LIBUSB_CALL libusb_get_configuration(libusb_device_handle *dev,
 	int *config)
 {
 	int r = LIBUSB_ERROR_NOT_SUPPORTED;
@@ -1186,7 +1186,7 @@ API_EXPORTED int LIBUSB_API libusb_get_configuration(libusb_device_handle *dev,
  * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
  * \returns another LIBUSB_ERROR code on other failure
  */
-API_EXPORTED int LIBUSB_API libusb_set_configuration(libusb_device_handle *dev,
+API_EXPORTED int LIBUSB_CALL libusb_set_configuration(libusb_device_handle *dev,
 	int configuration)
 {
 	usbi_dbg("configuration %d", configuration);
@@ -1217,7 +1217,7 @@ API_EXPORTED int LIBUSB_API libusb_set_configuration(libusb_device_handle *dev,
  * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
  * \returns a LIBUSB_ERROR code on other failure
  */
-API_EXPORTED int LIBUSB_API libusb_claim_interface(libusb_device_handle *dev,
+API_EXPORTED int LIBUSB_CALL libusb_claim_interface(libusb_device_handle *dev,
 	int interface_number)
 {
 	int r = 0;
@@ -1254,7 +1254,7 @@ out:
  * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
  * \returns another LIBUSB_ERROR code on other failure
  */
-API_EXPORTED int LIBUSB_API libusb_release_interface(libusb_device_handle *dev,
+API_EXPORTED int LIBUSB_CALL libusb_release_interface(libusb_device_handle *dev,
 	int interface_number)
 {
 	int r;
@@ -1299,7 +1299,7 @@ out:
  * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
  * \returns another LIBUSB_ERROR code on other failure
  */
-API_EXPORTED int LIBUSB_API libusb_set_interface_alt_setting(libusb_device_handle *dev,
+API_EXPORTED int LIBUSB_CALL libusb_set_interface_alt_setting(libusb_device_handle *dev,
 	int interface_number, int alternate_setting)
 {
 	usbi_dbg("interface %d altsetting %d",
@@ -1334,7 +1334,7 @@ API_EXPORTED int LIBUSB_API libusb_set_interface_alt_setting(libusb_device_handl
  * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
  * \returns another LIBUSB_ERROR code on other failure
  */
-API_EXPORTED int LIBUSB_API libusb_clear_halt(libusb_device_handle *dev,
+API_EXPORTED int LIBUSB_CALL libusb_clear_halt(libusb_device_handle *dev,
 	unsigned char endpoint)
 {
 	usbi_dbg("endpoint %x", endpoint);
@@ -1360,7 +1360,7 @@ API_EXPORTED int LIBUSB_API libusb_clear_halt(libusb_device_handle *dev,
  * device has been disconnected
  * \returns another LIBUSB_ERROR code on other failure
  */
-API_EXPORTED int LIBUSB_API libusb_reset_device(libusb_device_handle *dev)
+API_EXPORTED int LIBUSB_CALL libusb_reset_device(libusb_device_handle *dev)
 {
 	usbi_dbg("");
 	return usbi_backend->reset_device(dev);
@@ -1380,7 +1380,7 @@ API_EXPORTED int LIBUSB_API libusb_reset_device(libusb_device_handle *dev)
  * \returns another LIBUSB_ERROR code on other failure
  * \see libusb_detach_kernel_driver()
  */
-API_EXPORTED int LIBUSB_API libusb_kernel_driver_active(libusb_device_handle *dev,
+API_EXPORTED int LIBUSB_CALL libusb_kernel_driver_active(libusb_device_handle *dev,
 	int interface_number)
 {
 	usbi_dbg("interface %d", interface_number);
@@ -1405,7 +1405,7 @@ API_EXPORTED int LIBUSB_API libusb_kernel_driver_active(libusb_device_handle *de
  * \returns another LIBUSB_ERROR code on other failure
  * \see libusb_kernel_driver_active()
  */
-API_EXPORTED int LIBUSB_API libusb_detach_kernel_driver(libusb_device_handle *dev,
+API_EXPORTED int LIBUSB_CALL libusb_detach_kernel_driver(libusb_device_handle *dev,
 	int interface_number)
 {
 	usbi_dbg("interface %d", interface_number);
@@ -1432,7 +1432,7 @@ API_EXPORTED int LIBUSB_API libusb_detach_kernel_driver(libusb_device_handle *de
  * \returns another LIBUSB_ERROR code on other failure
  * \see libusb_kernel_driver_active()
  */
-API_EXPORTED int LIBUSB_API libusb_attach_kernel_driver(libusb_device_handle *dev,
+API_EXPORTED int LIBUSB_CALL libusb_attach_kernel_driver(libusb_device_handle *dev,
 	int interface_number)
 {
 	usbi_dbg("interface %d", interface_number);
@@ -1471,7 +1471,7 @@ API_EXPORTED int LIBUSB_API libusb_attach_kernel_driver(libusb_device_handle *de
  * \param ctx the context to operate on, or NULL for the default context
  * \param level debug level to set
  */
-API_EXPORTED void LIBUSB_API libusb_set_debug(libusb_context *ctx, int level)
+API_EXPORTED void LIBUSB_CALL libusb_set_debug(libusb_context *ctx, int level)
 {
 	USBI_GET_CONTEXT(ctx);
 	if (!ctx->debug_fixed)
@@ -1491,7 +1491,7 @@ API_EXPORTED void LIBUSB_API libusb_set_debug(libusb_context *ctx, int level)
  * \returns 0 on success, or a LIBUSB_ERROR code on failure
  * \see contexts
  */
-API_EXPORTED int LIBUSB_API libusb_init(libusb_context **context)
+API_EXPORTED int LIBUSB_CALL libusb_init(libusb_context **context)
 {
 	char *dbg = getenv("LIBUSB_DEBUG");
 	struct libusb_context *ctx;
@@ -1573,7 +1573,7 @@ err_unlock:
  * before your application terminates.
  * \param ctx the context to deinitialize, or NULL for the default context
  */
-API_EXPORTED void LIBUSB_API libusb_exit(struct libusb_context *ctx)
+API_EXPORTED void LIBUSB_CALL libusb_exit(struct libusb_context *ctx)
 {
 	USBI_GET_CONTEXT(ctx);
 	usbi_dbg("");
@@ -1679,7 +1679,7 @@ void usbi_log(struct libusb_context *ctx, enum usbi_log_level level,
  * \returns a short description of the error code in English, or NULL if the
  * error descriptions are unavailable
  */
-API_EXPORTED const char *LIBUSB_API libusb_strerror(enum libusb_error error_code)
+API_EXPORTED const char *LIBUSB_CALL libusb_strerror(enum libusb_error error_code)
 {
 	switch (error_code) {
 	case LIBUSB_SUCCESS:
@@ -1718,7 +1718,7 @@ API_EXPORTED const char *LIBUSB_API libusb_strerror(enum libusb_error error_code
  * Fills a libusb_version struct with the full version (major, minor,
  * micro, nano) of this library
  */
-API_EXPORTED const struct libusb_version* LIBUSB_API libusb_getversion(void)
+API_EXPORTED const struct libusb_version* LIBUSB_CALL libusb_getversion(void)
 {
 	return &libusb_version_internal;
 }
diff --git a/libusb/descriptor.c b/libusb/descriptor.c
index c1382fa..df7dfb5 100644
--- a/libusb/descriptor.c
+++ b/libusb/descriptor.c
@@ -430,7 +430,7 @@ err:
  * \param desc output location for the descriptor data
  * \returns 0 on success or a LIBUSB_ERROR code on failure
  */
-API_EXPORTED int LIBUSB_API libusb_get_device_descriptor(libusb_device *dev,
+API_EXPORTED int LIBUSB_CALL libusb_get_device_descriptor(libusb_device *dev,
 	struct libusb_device_descriptor *desc)
 {
 	unsigned char raw_desc[DEVICE_DESC_LENGTH];
@@ -466,7 +466,7 @@ API_EXPORTED int LIBUSB_API libusb_get_device_descriptor(libusb_device *dev,
  * \returns another LIBUSB_ERROR code on error
  * \see libusb_get_config_descriptor
  */
-API_EXPORTED int LIBUSB_API libusb_get_active_config_descriptor(libusb_device *dev,
+API_EXPORTED int LIBUSB_CALL libusb_get_active_config_descriptor(libusb_device *dev,
 	struct libusb_config_descriptor **config)
 {
 	struct libusb_config_descriptor *_config = malloc(sizeof(*_config));
@@ -531,7 +531,7 @@ err:
  * \see libusb_get_active_config_descriptor()
  * \see libusb_get_config_descriptor_by_value()
  */
-API_EXPORTED int LIBUSB_API libusb_get_config_descriptor(libusb_device *dev,
+API_EXPORTED int LIBUSB_CALL libusb_get_config_descriptor(libusb_device *dev,
 	uint8_t config_index, struct libusb_config_descriptor **config)
 {
 	struct libusb_config_descriptor *_config;
@@ -630,7 +630,7 @@ int usbi_get_config_index_by_value(struct libusb_device *dev,
  * \see libusb_get_active_config_descriptor()
  * \see libusb_get_config_descriptor()
  */
-API_EXPORTED int LIBUSB_API libusb_get_config_descriptor_by_value(libusb_device *dev,
+API_EXPORTED int LIBUSB_CALL libusb_get_config_descriptor_by_value(libusb_device *dev,
 	uint8_t bConfigurationValue, struct libusb_config_descriptor **config)
 {
 	int idx;
@@ -651,7 +651,7 @@ API_EXPORTED int LIBUSB_API libusb_get_config_descriptor_by_value(libusb_device
  *
  * \param config the configuration descriptor to free
  */
-API_EXPORTED void LIBUSB_API libusb_free_config_descriptor(
+API_EXPORTED void LIBUSB_CALL libusb_free_config_descriptor(
 	struct libusb_config_descriptor *config)
 {
 	if (!config)
@@ -673,7 +673,7 @@ API_EXPORTED void LIBUSB_API libusb_free_config_descriptor(
  * \param length size of data buffer
  * \returns number of bytes returned in data, or LIBUSB_ERROR code on failure
  */
-API_EXPORTED int LIBUSB_API libusb_get_string_descriptor_ascii(libusb_device_handle *dev,
+API_EXPORTED int LIBUSB_CALL libusb_get_string_descriptor_ascii(libusb_device_handle *dev,
 	uint8_t desc_index, unsigned char *data, int length)
 {
 	unsigned char tbuf[255]; /* Some devices choke on size > 255 */
diff --git a/libusb/io.c b/libusb/io.c
index 2e25e33..39285e7 100644
--- a/libusb/io.c
+++ b/libusb/io.c
@@ -1177,7 +1177,7 @@ out:
  * \param iso_packets number of isochronous packet descriptors to allocate
  * \returns a newly allocated transfer, or NULL on error
  */
-API_EXPORTED struct libusb_transfer* LIBUSB_API libusb_alloc_transfer(int iso_packets)
+API_EXPORTED struct libusb_transfer* LIBUSB_CALL libusb_alloc_transfer(int iso_packets)
 {
 	size_t os_alloc_size = usbi_backend->transfer_priv_size
 		+ (usbi_backend->add_iso_packet_size * iso_packets);
@@ -1212,7 +1212,7 @@ API_EXPORTED struct libusb_transfer* LIBUSB_API libusb_alloc_transfer(int iso_pa
  *
  * \param transfer the transfer to free
  */
-API_EXPORTED void LIBUSB_API libusb_free_transfer(struct libusb_transfer *transfer)
+API_EXPORTED void LIBUSB_CALL libusb_free_transfer(struct libusb_transfer *transfer)
 {
 	struct usbi_transfer *itransfer;
 	if (!transfer)
@@ -1236,7 +1236,7 @@ API_EXPORTED void LIBUSB_API libusb_free_transfer(struct libusb_transfer *transf
  * \returns LIBUSB_ERROR_BUSY if the transfer has already been submitted.
  * \returns another LIBUSB_ERROR code on other failure
  */
-API_EXPORTED int LIBUSB_API libusb_submit_transfer(struct libusb_transfer *transfer)
+API_EXPORTED int LIBUSB_CALL libusb_submit_transfer(struct libusb_transfer *transfer)
 {
 	struct libusb_context *ctx = TRANSFER_CTX(transfer);
 	struct usbi_transfer *itransfer =
@@ -1292,7 +1292,7 @@ out:
  * cancelled.
  * \returns a LIBUSB_ERROR code on failure
  */
-API_EXPORTED int LIBUSB_API libusb_cancel_transfer(struct libusb_transfer *transfer)
+API_EXPORTED int LIBUSB_CALL libusb_cancel_transfer(struct libusb_transfer *transfer)
 {
 	struct usbi_transfer *itransfer =
 		__LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer);
@@ -1464,7 +1464,7 @@ int usbi_handle_transfer_cancellation(struct usbi_transfer *transfer)
  * \returns 1 if the lock was not obtained (i.e. another thread holds the lock)
  * \see \ref mtasync
  */
-API_EXPORTED int LIBUSB_API libusb_try_lock_events(libusb_context *ctx)
+API_EXPORTED int LIBUSB_CALL libusb_try_lock_events(libusb_context *ctx)
 {
 	int r;
 	USBI_GET_CONTEXT(ctx);
@@ -1505,7 +1505,7 @@ API_EXPORTED int LIBUSB_API libusb_try_lock_events(libusb_context *ctx)
  * \param ctx the context to operate on, or NULL for the default context
  * \see \ref mtasync
  */
-API_EXPORTED void LIBUSB_API libusb_lock_events(libusb_context *ctx)
+API_EXPORTED void LIBUSB_CALL libusb_lock_events(libusb_context *ctx)
 {
 	USBI_GET_CONTEXT(ctx);
 	usbi_mutex_lock(&ctx->events_lock);
@@ -1520,7 +1520,7 @@ API_EXPORTED void LIBUSB_API libusb_lock_events(libusb_context *ctx)
  * \param ctx the context to operate on, or NULL for the default context
  * \see \ref mtasync
  */
-API_EXPORTED void LIBUSB_API libusb_unlock_events(libusb_context *ctx)
+API_EXPORTED void LIBUSB_CALL libusb_unlock_events(libusb_context *ctx)
 {
 	USBI_GET_CONTEXT(ctx);
 	ctx->event_handler_active = 0;
@@ -1555,7 +1555,7 @@ API_EXPORTED void LIBUSB_API libusb_unlock_events(libusb_context *ctx)
  * \returns 0 if this thread must give up the events lock
  * \see \ref fullstory "Multi-threaded I/O: the full story"
  */
-API_EXPORTED int LIBUSB_API libusb_event_handling_ok(libusb_context *ctx)
+API_EXPORTED int LIBUSB_CALL libusb_event_handling_ok(libusb_context *ctx)
 {
 	int r;
 	USBI_GET_CONTEXT(ctx);
@@ -1583,7 +1583,7 @@ API_EXPORTED int LIBUSB_API libusb_event_handling_ok(libusb_context *ctx)
  * \returns 0 if there are no threads currently handling events
  * \see \ref mtasync
  */
-API_EXPORTED int LIBUSB_API libusb_event_handler_active(libusb_context *ctx)
+API_EXPORTED int LIBUSB_CALL libusb_event_handler_active(libusb_context *ctx)
 {
 	int r;
 	USBI_GET_CONTEXT(ctx);
@@ -1620,7 +1620,7 @@ API_EXPORTED int LIBUSB_API libusb_event_handler_active(libusb_context *ctx)
  * \param ctx the context to operate on, or NULL for the default context
  * \see \ref mtasync
  */
-API_EXPORTED void LIBUSB_API libusb_lock_event_waiters(libusb_context *ctx)
+API_EXPORTED void LIBUSB_CALL libusb_lock_event_waiters(libusb_context *ctx)
 {
 	USBI_GET_CONTEXT(ctx);
 	usbi_mutex_lock(&ctx->event_waiters_lock);
@@ -1631,7 +1631,7 @@ API_EXPORTED void LIBUSB_API libusb_lock_event_waiters(libusb_context *ctx)
  * \param ctx the context to operate on, or NULL for the default context
  * \see \ref mtasync
  */
-API_EXPORTED void LIBUSB_API libusb_unlock_event_waiters(libusb_context *ctx)
+API_EXPORTED void LIBUSB_CALL libusb_unlock_event_waiters(libusb_context *ctx)
 {
 	USBI_GET_CONTEXT(ctx);
 	usbi_mutex_unlock(&ctx->event_waiters_lock);
@@ -1662,7 +1662,7 @@ API_EXPORTED void LIBUSB_API libusb_unlock_event_waiters(libusb_context *ctx)
  * \returns 1 if the timeout expired
  * \see \ref mtasync
  */
-API_EXPORTED int LIBUSB_API libusb_wait_for_event(libusb_context *ctx, struct timeval *tv)
+API_EXPORTED int LIBUSB_CALL libusb_wait_for_event(libusb_context *ctx, struct timeval *tv)
 {
 	struct timespec timeout;
 	int r;
@@ -1942,7 +1942,7 @@ static int get_next_timeout(libusb_context *ctx, struct timeval *tv,
  * non-blocking mode
  * \returns 0 on success, or a LIBUSB_ERROR code on failure
  */
-API_EXPORTED int LIBUSB_API libusb_handle_events_timeout(libusb_context *ctx,
+API_EXPORTED int LIBUSB_CALL libusb_handle_events_timeout(libusb_context *ctx,
 	struct timeval *tv)
 {
 	int r;
@@ -1996,7 +1996,7 @@ retry:
  * \param ctx the context to operate on, or NULL for the default context
  * \returns 0 on success, or a LIBUSB_ERROR code on failure
  */
-API_EXPORTED int LIBUSB_API libusb_handle_events(libusb_context *ctx)
+API_EXPORTED int LIBUSB_CALL libusb_handle_events(libusb_context *ctx)
 {
 	struct timeval tv;
 	tv.tv_sec = 60;
@@ -2021,7 +2021,7 @@ API_EXPORTED int LIBUSB_API libusb_handle_events(libusb_context *ctx)
  * \returns 0 on success, or a LIBUSB_ERROR code on failure
  * \see \ref mtasync
  */
-API_EXPORTED int LIBUSB_API libusb_handle_events_locked(libusb_context *ctx,
+API_EXPORTED int LIBUSB_CALL libusb_handle_events_locked(libusb_context *ctx,
 	struct timeval *tv)
 {
 	int r;
@@ -2065,7 +2065,7 @@ API_EXPORTED int LIBUSB_API libusb_handle_events_locked(libusb_context *ctx,
  * or through regular activity on the file descriptors.
  * \see \ref pollmain "Polling libusb file descriptors for event handling"
  */
-API_EXPORTED int LIBUSB_API libusb_pollfds_handle_timeouts(libusb_context *ctx)
+API_EXPORTED int LIBUSB_CALL libusb_pollfds_handle_timeouts(libusb_context *ctx)
 {
 #if defined(USBI_OS_HANDLES_TIMEOUT)
 	return 1;
@@ -2105,7 +2105,7 @@ API_EXPORTED int LIBUSB_API libusb_pollfds_handle_timeouts(libusb_context *ctx)
  * \returns 0 if there are no pending timeouts, 1 if a timeout was returned,
  * or LIBUSB_ERROR_OTHER on failure
  */
-API_EXPORTED int LIBUSB_API libusb_get_next_timeout(libusb_context *ctx,
+API_EXPORTED int LIBUSB_CALL libusb_get_next_timeout(libusb_context *ctx,
 	struct timeval *tv)
 {
 #ifndef USBI_OS_HANDLES_TIMEOUT
@@ -2191,7 +2191,7 @@ API_EXPORTED int LIBUSB_API libusb_get_next_timeout(libusb_context *ctx,
  * \param user_data User data to be passed back to callbacks (useful for
  * passing context information)
  */
-API_EXPORTED void LIBUSB_API libusb_set_pollfd_notifiers(libusb_context *ctx,
+API_EXPORTED void LIBUSB_CALL libusb_set_pollfd_notifiers(libusb_context *ctx,
 	libusb_pollfd_added_cb added_cb, libusb_pollfd_removed_cb removed_cb,
 	void *user_data)
 {
@@ -2260,7 +2260,7 @@ void usbi_remove_pollfd(struct libusb_context *ctx, int fd)
  * \returns a NULL-terminated list of libusb_pollfd structures, or NULL on
  * error
  */
-API_EXPORTED const struct libusb_pollfd** LIBUSB_API libusb_get_pollfds(
+API_EXPORTED const struct libusb_pollfd** LIBUSB_CALL libusb_get_pollfds(
 	libusb_context *ctx)
 {
 #ifndef OS_WINDOWS
diff --git a/libusb/libusb.h b/libusb/libusb.h
index 6d9d968..f72c29e 100644
--- a/libusb/libusb.h
+++ b/libusb/libusb.h
@@ -48,9 +48,9 @@
 #endif
 
 #if defined(_WIN32) || defined(__CYGWIN__)
-#define LIBUSB_API WINAPI
+#define LIBUSB_CALL WINAPI
 #else
-#define LIBUSB_API
+#define LIBUSB_CALL
 #endif
 
 #ifdef __cplusplus
@@ -746,7 +746,7 @@ struct libusb_transfer;
  * \param transfer The libusb_transfer struct the callback function is being
  * notified about.
  */
-typedef void (LIBUSB_API *libusb_transfer_cb_fn)(struct libusb_transfer *transfer);
+typedef void (LIBUSB_CALL *libusb_transfer_cb_fn)(struct libusb_transfer *transfer);
 
 /** \ingroup asyncio
  * The generic USB transfer structure. The user populates this structure and
@@ -812,52 +812,52 @@ struct libusb_transfer {
 	;
 };
 
-int LIBUSB_API libusb_init(libusb_context **ctx);
-void LIBUSB_API libusb_exit(libusb_context *ctx);
-void LIBUSB_API libusb_set_debug(libusb_context *ctx, int level);
-const char *LIBUSB_API libusb_strerror(enum libusb_error errcode);
-const struct libusb_version *LIBUSB_API libusb_getversion(void);
+int LIBUSB_CALL libusb_init(libusb_context **ctx);
+void LIBUSB_CALL libusb_exit(libusb_context *ctx);
+void LIBUSB_CALL libusb_set_debug(libusb_context *ctx, int level);
+const char *LIBUSB_CALL libusb_strerror(enum libusb_error errcode);
+const struct libusb_version *LIBUSB_CALL libusb_getversion(void);
 
-ssize_t LIBUSB_API libusb_get_device_list(libusb_context *ctx,
+ssize_t LIBUSB_CALL libusb_get_device_list(libusb_context *ctx,
 	libusb_device ***list);
-void LIBUSB_API libusb_free_device_list(libusb_device **list, int unref_devices);
-libusb_device* LIBUSB_API libusb_ref_device(libusb_device *dev);
-void LIBUSB_API libusb_unref_device(libusb_device *dev);
+void LIBUSB_CALL libusb_free_device_list(libusb_device **list, int unref_devices);
+libusb_device* LIBUSB_CALL libusb_ref_device(libusb_device *dev);
+void LIBUSB_CALL libusb_unref_device(libusb_device *dev);
 
-int LIBUSB_API libusb_get_configuration(libusb_device_handle *dev, int *config);
-int LIBUSB_API libusb_get_device_descriptor(libusb_device *dev,
+int LIBUSB_CALL libusb_get_configuration(libusb_device_handle *dev, int *config);
+int LIBUSB_CALL libusb_get_device_descriptor(libusb_device *dev,
 	struct libusb_device_descriptor *desc);
-int LIBUSB_API libusb_get_active_config_descriptor(libusb_device *dev,
+int LIBUSB_CALL libusb_get_active_config_descriptor(libusb_device *dev,
 	struct libusb_config_descriptor **config);
-int LIBUSB_API libusb_get_config_descriptor(libusb_device *dev, uint8_t config_index,
+int LIBUSB_CALL libusb_get_config_descriptor(libusb_device *dev, uint8_t config_index,
 	struct libusb_config_descriptor **config);
-int LIBUSB_API libusb_get_config_descriptor_by_value(libusb_device *dev,
+int LIBUSB_CALL libusb_get_config_descriptor_by_value(libusb_device *dev,
 	uint8_t bConfigurationValue, struct libusb_config_descriptor **config);
-void LIBUSB_API libusb_free_config_descriptor(struct libusb_config_descriptor *config);
-uint8_t LIBUSB_API libusb_get_bus_number(libusb_device *dev);
-uint8_t LIBUSB_API libusb_get_device_address(libusb_device *dev);
-int LIBUSB_API libusb_get_max_packet_size(libusb_device *dev, unsigned char endpoint);
-int LIBUSB_API libusb_get_max_iso_packet_size(libusb_device *dev, unsigned char endpoint);
+void LIBUSB_CALL libusb_free_config_descriptor(struct libusb_config_descriptor *config);
+uint8_t LIBUSB_CALL libusb_get_bus_number(libusb_device *dev);
+uint8_t LIBUSB_CALL libusb_get_device_address(libusb_device *dev);
+int LIBUSB_CALL libusb_get_max_packet_size(libusb_device *dev, unsigned char endpoint);
+int LIBUSB_CALL libusb_get_max_iso_packet_size(libusb_device *dev, unsigned char endpoint);
 
-int LIBUSB_API libusb_open(libusb_device *dev, libusb_device_handle **handle);
-void LIBUSB_API libusb_close(libusb_device_handle *dev_handle);
-libusb_device* LIBUSB_API libusb_get_device(libusb_device_handle *dev_handle);
+int LIBUSB_CALL libusb_open(libusb_device *dev, libusb_device_handle **handle);
+void LIBUSB_CALL libusb_close(libusb_device_handle *dev_handle);
+libusb_device* LIBUSB_CALL libusb_get_device(libusb_device_handle *dev_handle);
 
-int LIBUSB_API libusb_set_configuration(libusb_device_handle *dev, int configuration);
-int LIBUSB_API libusb_claim_interface(libusb_device_handle *dev, int interface_number);
-int LIBUSB_API libusb_release_interface(libusb_device_handle *dev, int interface_number);
+int LIBUSB_CALL libusb_set_configuration(libusb_device_handle *dev, int configuration);
+int LIBUSB_CALL libusb_claim_interface(libusb_device_handle *dev, int interface_number);
+int LIBUSB_CALL libusb_release_interface(libusb_device_handle *dev, int interface_number);
 
-libusb_device_handle* LIBUSB_API libusb_open_device_with_vid_pid(libusb_context *ctx,
+libusb_device_handle* LIBUSB_CALL libusb_open_device_with_vid_pid(libusb_context *ctx,
 	uint16_t vendor_id, uint16_t product_id);
 
-int LIBUSB_API libusb_set_interface_alt_setting(libusb_device_handle *dev,
+int LIBUSB_CALL libusb_set_interface_alt_setting(libusb_device_handle *dev,
 	int interface_number, int alternate_setting);
-int LIBUSB_API libusb_clear_halt(libusb_device_handle *dev, unsigned char endpoint);
-int LIBUSB_API libusb_reset_device(libusb_device_handle *dev);
+int LIBUSB_CALL libusb_clear_halt(libusb_device_handle *dev, unsigned char endpoint);
+int LIBUSB_CALL libusb_reset_device(libusb_device_handle *dev);
 
-int LIBUSB_API libusb_kernel_driver_active(libusb_device_handle *dev, int interface_number);
-int LIBUSB_API libusb_detach_kernel_driver(libusb_device_handle *dev, int interface_number);
-int LIBUSB_API libusb_attach_kernel_driver(libusb_device_handle *dev, int interface_number);
+int LIBUSB_CALL libusb_kernel_driver_active(libusb_device_handle *dev, int interface_number);
+int LIBUSB_CALL libusb_detach_kernel_driver(libusb_device_handle *dev, int interface_number);
+int LIBUSB_CALL libusb_attach_kernel_driver(libusb_device_handle *dev, int interface_number);
 
 /* async I/O */
 
@@ -931,10 +931,10 @@ static inline void libusb_fill_control_setup(unsigned char *buffer,
 	setup->wLength = libusb_cpu_to_le16(wLength);
 }
 
-struct libusb_transfer* LIBUSB_API libusb_alloc_transfer(int iso_packets);
-int LIBUSB_API libusb_submit_transfer(struct libusb_transfer *transfer);
-int LIBUSB_API libusb_cancel_transfer(struct libusb_transfer *transfer);
-void LIBUSB_API libusb_free_transfer(struct libusb_transfer *transfer);
+struct libusb_transfer* LIBUSB_CALL libusb_alloc_transfer(int iso_packets);
+int LIBUSB_CALL libusb_submit_transfer(struct libusb_transfer *transfer);
+int LIBUSB_CALL libusb_cancel_transfer(struct libusb_transfer *transfer);
+void LIBUSB_CALL libusb_free_transfer(struct libusb_transfer *transfer);
 
 /** \ingroup asyncio
  * Helper function to populate the required \ref libusb_transfer fields
@@ -1161,15 +1161,15 @@ static inline unsigned char *libusb_get_iso_packet_buffer_simple(
 
 /* sync I/O */
 
-int LIBUSB_API libusb_control_transfer(libusb_device_handle *dev_handle,
+int LIBUSB_CALL libusb_control_transfer(libusb_device_handle *dev_handle,
 	uint8_t request_type, uint8_t bRequest, uint16_t wValue, uint16_t wIndex,
 	unsigned char *data, uint16_t wLength, unsigned int timeout);
 
-int LIBUSB_API libusb_bulk_transfer(libusb_device_handle *dev_handle,
+int LIBUSB_CALL libusb_bulk_transfer(libusb_device_handle *dev_handle,
 	unsigned char endpoint, unsigned char *data, int length,
 	int *actual_length, unsigned int timeout);
 
-int LIBUSB_API libusb_interrupt_transfer(libusb_device_handle *dev_handle,
+int LIBUSB_CALL libusb_interrupt_transfer(libusb_device_handle *dev_handle,
 	unsigned char endpoint, unsigned char *data, int length,
 	int *actual_length, unsigned int timeout);
 
@@ -1215,25 +1215,25 @@ static inline int libusb_get_string_descriptor(libusb_device_handle *dev,
 		langid, data, (uint16_t) length, 1000);
 }
 
-int LIBUSB_API libusb_get_string_descriptor_ascii(libusb_device_handle *dev,
+int LIBUSB_CALL libusb_get_string_descriptor_ascii(libusb_device_handle *dev,
 	uint8_t desc_index, unsigned char *data, int length);
 
 /* polling and timeouts */
 
-int LIBUSB_API libusb_try_lock_events(libusb_context *ctx);
-void LIBUSB_API libusb_lock_events(libusb_context *ctx);
-void LIBUSB_API libusb_unlock_events(libusb_context *ctx);
-int LIBUSB_API libusb_event_handling_ok(libusb_context *ctx);
-int LIBUSB_API libusb_event_handler_active(libusb_context *ctx);
-void LIBUSB_API libusb_lock_event_waiters(libusb_context *ctx);
-void LIBUSB_API libusb_unlock_event_waiters(libusb_context *ctx);
-int LIBUSB_API libusb_wait_for_event(libusb_context *ctx, struct timeval *tv);
-
-int LIBUSB_API libusb_handle_events_timeout(libusb_context *ctx, struct timeval *tv);
-int LIBUSB_API libusb_handle_events(libusb_context *ctx);
-int LIBUSB_API libusb_handle_events_locked(libusb_context *ctx, struct timeval *tv);
-int LIBUSB_API libusb_pollfds_handle_timeouts(libusb_context *ctx);
-int LIBUSB_API libusb_get_next_timeout(libusb_context *ctx, struct timeval *tv);
+int LIBUSB_CALL libusb_try_lock_events(libusb_context *ctx);
+void LIBUSB_CALL libusb_lock_events(libusb_context *ctx);
+void LIBUSB_CALL libusb_unlock_events(libusb_context *ctx);
+int LIBUSB_CALL libusb_event_handling_ok(libusb_context *ctx);
+int LIBUSB_CALL libusb_event_handler_active(libusb_context *ctx);
+void LIBUSB_CALL libusb_lock_event_waiters(libusb_context *ctx);
+void LIBUSB_CALL libusb_unlock_event_waiters(libusb_context *ctx);
+int LIBUSB_CALL libusb_wait_for_event(libusb_context *ctx, struct timeval *tv);
+
+int LIBUSB_CALL libusb_handle_events_timeout(libusb_context *ctx, struct timeval *tv);
+int LIBUSB_CALL libusb_handle_events(libusb_context *ctx);
+int LIBUSB_CALL libusb_handle_events_locked(libusb_context *ctx, struct timeval *tv);
+int LIBUSB_CALL libusb_pollfds_handle_timeouts(libusb_context *ctx);
+int LIBUSB_CALL libusb_get_next_timeout(libusb_context *ctx, struct timeval *tv);
 
 /** \ingroup poll
  * File descriptor for polling
@@ -1259,7 +1259,7 @@ struct libusb_pollfd {
  * libusb_set_pollfd_notifiers() call
  * \see libusb_set_pollfd_notifiers()
  */
-typedef void (LIBUSB_API *libusb_pollfd_added_cb)(int fd, short events, void *user_data);
+typedef void (LIBUSB_CALL *libusb_pollfd_added_cb)(int fd, short events, void *user_data);
 
 /** \ingroup poll
  * Callback function, invoked when a file descriptor should be removed from
@@ -1270,10 +1270,10 @@ typedef void (LIBUSB_API *libusb_pollfd_added_cb)(int fd, short events, void *us
  * libusb_set_pollfd_notifiers() call
  * \see libusb_set_pollfd_notifiers()
  */
-typedef void (LIBUSB_API *libusb_pollfd_removed_cb)(int fd, void *user_data);
+typedef void (LIBUSB_CALL *libusb_pollfd_removed_cb)(int fd, void *user_data);
 
-const struct libusb_pollfd** LIBUSB_API libusb_get_pollfds(libusb_context *ctx);
-void LIBUSB_API libusb_set_pollfd_notifiers(libusb_context *ctx,
+const struct libusb_pollfd** LIBUSB_CALL libusb_get_pollfds(libusb_context *ctx);
+void LIBUSB_CALL libusb_set_pollfd_notifiers(libusb_context *ctx,
 	libusb_pollfd_added_cb added_cb, libusb_pollfd_removed_cb removed_cb,
 	void *user_data);
 
diff --git a/libusb/sync.c b/libusb/sync.c
index 0c6d3ff..8c3f0a0 100644
--- a/libusb/sync.c
+++ b/libusb/sync.c
@@ -33,7 +33,7 @@
  * may wish to consider using the \ref asyncio "asynchronous I/O API" instead.
  */
 
-static void LIBUSB_API ctrl_transfer_cb(struct libusb_transfer *transfer)
+static void LIBUSB_CALL ctrl_transfer_cb(struct libusb_transfer *transfer)
 {
 	int *completed = transfer->user_data;
 	*completed = 1;
@@ -69,7 +69,7 @@ static void LIBUSB_API ctrl_transfer_cb(struct libusb_transfer *transfer)
  * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
  * \returns another LIBUSB_ERROR code on other failures
  */
-API_EXPORTED int LIBUSB_API libusb_control_transfer(libusb_device_handle *dev_handle,
+API_EXPORTED int LIBUSB_CALL libusb_control_transfer(libusb_device_handle *dev_handle,
 	uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex,
 	unsigned char *data, uint16_t wLength, unsigned int timeout)
 {
@@ -142,7 +142,7 @@ API_EXPORTED int LIBUSB_API libusb_control_transfer(libusb_device_handle *dev_ha
 	return r;
 }
 
-static void LIBUSB_API bulk_transfer_cb(struct libusb_transfer *transfer)
+static void LIBUSB_CALL bulk_transfer_cb(struct libusb_transfer *transfer)
 {
 	int *completed = transfer->user_data;
 	*completed = 1;
@@ -252,7 +252,7 @@ static int do_sync_bulk_transfer(struct libusb_device_handle *dev_handle,
  * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
  * \returns another LIBUSB_ERROR code on other failures
  */
-API_EXPORTED int LIBUSB_API libusb_bulk_transfer(struct libusb_device_handle *dev_handle,
+API_EXPORTED int LIBUSB_CALL libusb_bulk_transfer(struct libusb_device_handle *dev_handle,
 	unsigned char endpoint, unsigned char *data, int length, int *transferred,
 	unsigned int timeout)
 {
@@ -301,7 +301,7 @@ API_EXPORTED int LIBUSB_API libusb_bulk_transfer(struct libusb_device_handle *de
  * \returns LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
  * \returns another LIBUSB_ERROR code on other error
  */
-API_EXPORTED int LIBUSB_API libusb_interrupt_transfer(
+API_EXPORTED int LIBUSB_CALL libusb_interrupt_transfer(
 	struct libusb_device_handle *dev_handle, unsigned char endpoint,
 	unsigned char *data, int length, int *transferred, unsigned int timeout)
 {