From 96647f14863f889f40aed2379dea1712f64f856c Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Fri, 16 May 2014 16:02:29 +0000 Subject: [PATCH] * dfu.c (dfu_open, dfu_init): Fix signature of the dummy functions (in the !HAVE_LIBUSB case) to match prototypes. git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1303 81a1dc3b-b13d-400b-aceb-764788c761c2 --- ChangeLog | 5 +++++ dfu.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e9c473c..bccd22d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-05-16 Joerg Wunsch + + * dfu.c (dfu_open, dfu_init): Fix signature of the dummy functions + (in the !HAVE_LIBUSB case) to match prototypes. + 2014-05-16 Joerg Wunsch * avr910.c: Replace all occurences of exit() in potential library diff --git a/dfu.c b/dfu.c index d88743e5..75632f65 100644 --- a/dfu.c +++ b/dfu.c @@ -36,13 +36,13 @@ #ifndef HAVE_LIBUSB -int dfu_open(struct dfu_dev *dfu, char *port_name) { +struct dfu_dev *dfu_open(char *port_name) { fprintf(stderr, "%s: Error: No USB support in this compile of avrdude\n", progname); - return -1; + return NULL; } -int dfu_init(struct dfu_dev *dfu, unsigned short usb_pid) { +int dfu_init(struct dfu_dev *dfu, unsigned short usb_vid, unsigned short usb_pid) { return -1; }