From 49ba59369aed3a101aa5758daffe4553dd5ddf6c Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Thu, 27 Sep 2018 09:11:13 +0200 Subject: [PATCH] aesx660: Remove home-grown min() implementation And use GLib's. --- libfprint/drivers/aesx660.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libfprint/drivers/aesx660.c b/libfprint/drivers/aesx660.c index b98ddf7..9af93e3 100644 --- a/libfprint/drivers/aesx660.c +++ b/libfprint/drivers/aesx660.c @@ -35,8 +35,6 @@ static void complete_deactivation(struct fp_img_dev *dev); #define BULK_TIMEOUT 4000 #define FRAME_HEIGHT AESX660_FRAME_HEIGHT -#define min(a, b) (((a) < (b)) ? (a) : (b)) - static void aesX660_send_cmd_timeout(fpi_ssm *ssm, struct fp_dev *_dev, @@ -334,7 +332,7 @@ static void capture_read_stripe_data_cb(struct libusb_transfer *transfer) fp_dbg("Got %lu bytes of data", actual_len); do { - copied = min(aesdev->buffer_max - aesdev->buffer_size, actual_len); + copied = MIN(aesdev->buffer_max - aesdev->buffer_size, actual_len); memcpy(aesdev->buffer + aesdev->buffer_size, data, copied);