Fix kvs1024 compiling on platforms without libusb

Removed direct include of usb.h in backend since it
should be using sanei_usb.  Completed prototype
of sane_exit(void) for some versions of gcc that are
strict about that.

Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
merge-requests/1/head
Chris Bagwell 2010-04-02 16:02:21 -05:00
rodzic 9756524042
commit 1df16a29aa
4 zmienionych plików z 6 dodań i 7 usunięć

Wyświetl plik

@ -1,3 +1,8 @@
2010-04-02 Chris Bagwell <chris at cnpbagwell dot com>
* backend/kvs1024*: Remove includes of usb.h
directly into backend. Complete prototype
for sane_exit().
2010-04-02 Chris Bagwell <chris at cnpbagwell dot com>
* po/Makefile.am: Remove unneeded distclean-local target.

Wyświetl plik

@ -21,8 +21,6 @@
#include <sys/wait.h>
#include <unistd.h>
#include <usb.h>
#include "../include/sane/sane.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei.h"
@ -73,7 +71,7 @@ sane_init (SANE_Int * version_code,
/* Terminate the KV-S1025 SANE backend */
void
sane_exit ()
sane_exit (void)
{
DBG (DBG_proc, "sane_exit: enter\n");

Wyświetl plik

@ -20,8 +20,6 @@
#include <sys/wait.h>
#include <unistd.h>
#include <usb.h>
#include "../include/sane/sane.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei.h"

Wyświetl plik

@ -20,8 +20,6 @@
#include <sys/wait.h>
#include <unistd.h>
#include <usb.h>
#include "../include/sane/sane.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei.h"