mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

standardize including local sane/ include files. 

Source code was inconsistent on how they were referencing
include files in include/sane.  In certain cases, sane/sane.h
and sane/saneopts.h was really including external copies (with
some preprocessor implementations anyways).
merge-requests/1/head
chris@cnpbagwell.com 2009-05-07 22:06:20 -05:00
rodzic 41a6a5d7cd
commit 4d9e8138af
85 zmienionych plików z 355 dodań i 355 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

16
backend/abaton.c
Wyświetl plik

@ -45,7 +45,7 @@
This file implements a SANE backend for Abaton flatbed scanners. */
#include "sane/config.h"
#include "../include/sane/config.h"
#include <ctype.h>
#include <errno.h>
@ -61,21 +61,21 @@
#include <sys/types.h>
#include <sys/wait.h>
#include "_stdint.h"
#include "../include/_stdint.h"
#include "sane/sane.h"
#include "sane/sanei.h"
#include "sane/saneopts.h"
#include "sane/sanei_scsi.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_scsi.h"
#define BACKEND_NAME abaton
#include "sane/sanei_backend.h"
#include "../include/sane/sanei_backend.h"
#ifndef PATH_MAX
# define PATH_MAX 1024
#endif
#include "sane/sanei_config.h"
#include "../include/sane/sanei_config.h"
#define ABATON_CONFIG_FILE "abaton.conf"
#include "abaton.h"

16
backend/agfafocus.c
Wyświetl plik

@ -21,7 +21,7 @@
This file implements a SANE backend for AGFA Focus flatbed scanners. */
#include "sane/config.h"
#include "../include/sane/config.h"
#include <signal.h>
#include <errno.h>
@ -31,15 +31,15 @@
#include <string.h>
#include <sys/types.h>
#include "sane/sane.h"
#include "sane/sanei.h"
#include "sane/sanei_config.h"
#include "sane/saneopts.h"
#include "sane/sanei_scsi.h"
#include "sane/sanei_thread.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"
#include "../include/sane/sanei_config.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_scsi.h"
#include "../include/sane/sanei_thread.h"
#define BACKEND_NAME agfafocus
#include "sane/sanei_backend.h"
#include "../include/sane/sanei_backend.h"
#include "agfafocus.h"

16
backend/apple.c
Wyświetl plik

@ -43,7 +43,7 @@
This file implements a SANE backend for Apple flatbed scanners. */
#include "sane/config.h"
#include "../include/sane/config.h"
#include <ctype.h>
#include <errno.h>
@ -59,12 +59,12 @@
#include <sys/types.h>
#include <sys/wait.h>
#include "_stdint.h"
#include "../include/_stdint.h"
#include "sane/sane.h"
#include "sane/sanei.h"
#include "sane/saneopts.h"
#include "sane/sanei_scsi.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_scsi.h"
/* SCSI commands that the Apple scanners understand: */
@ -124,13 +124,13 @@
#define READ24(p) *(p)*65536 + *(p+1)*256 + *(p+2)
#include "sane/sanei_backend.h"
#include "../include/sane/sanei_backend.h"
#ifndef PATH_MAX
# define PATH_MAX 1024
#endif
#include "sane/sanei_config.h"
#include "../include/sane/sanei_config.h"
#define APPLE_CONFIG_FILE "apple.conf"
#include "apple.h"

12
backend/artec.c
Wyświetl plik

@ -68,13 +68,13 @@
#include <sys/stat.h>
#include <fcntl.h>
#include "_stdint.h"
#include "../include/_stdint.h"
#include "sane/sane.h"
#include "sane/saneopts.h"
#include "sane/sanei_scsi.h"
#include "sane/sanei_backend.h"
#include "sane/sanei_config.h"
#include "../include/sane/sane.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_scsi.h"
#include "../include/sane/sanei_backend.h"
#include "../include/sane/sanei_config.h"
#include <artec.h>

4
backend/artec_eplus48u.c
Wyświetl plik

@ -93,8 +93,8 @@ Updates (C) 2001 by Henning Meier-Geinitz.
#include "../include/sane/saneopts.h"
#define BACKEND_NAME artec_eplus48u
#include "sane/sanei_backend.h"
#include "sane/sanei_config.h"
#include "../include/sane/sanei_backend.h"
#include "../include/sane/sanei_config.h"
#include "artec_eplus48u.h"

2
backend/as6e.h
Wyświetl plik

@ -48,7 +48,7 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <sane/sane.h>
#include "../include/sane/sane.h"
typedef enum

16
backend/avision.c
Wyświetl plik

@ -136,14 +136,14 @@
#define BACKEND_NAME avision
#define BACKEND_BUILD 290 /* avision backend BUILD version */
#include <sane/sane.h>
#include <sane/sanei.h>
#include <sane/saneopts.h>
#include <sane/sanei_thread.h>
#include <sane/sanei_scsi.h>
#include <sane/sanei_usb.h>
#include <sane/sanei_config.h>
#include <sane/sanei_backend.h>
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_thread.h"
#include "../include/sane/sanei_scsi.h"
#include "../include/sane/sanei_usb.h"
#include "../include/sane/sanei_config.h"
#include "../include/sane/sanei_backend.h"
#include <avision.h>

12
backend/bh.c
Wyświetl plik

@ -42,7 +42,7 @@
If you do not wish that, delete this exception notice.
*/
#include "sane/config.h"
#include "../include/sane/config.h"
#include <limits.h>
#include <errno.h>
#include <fcntl.h>
@ -52,13 +52,13 @@
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
#include "sane/sane.h"
#include "sane/saneopts.h"
#include "sane/sanei_scsi.h"
#include "sane/sanei_config.h"
#include "../include/sane/sane.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_scsi.h"
#include "../include/sane/sanei_config.h"
#define BACKEND_NAME bh
#include "sane/sanei_backend.h"
#include "../include/sane/sanei_backend.h"
#define BUILD 4
#include "bh.h"

10
backend/canon.c
Wyświetl plik

@ -106,19 +106,19 @@
#include <unistd.h> /* for FB1200S */
#include <errno.h> /* for FB1200S */
#include <sane/sane.h>
#include <sane/saneopts.h>
#include <sane/sanei_scsi.h>
#include "../include/sane/sane.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_scsi.h"
#define BACKEND_NAME canon
#include <sane/sanei_backend.h>
#include "../include/sane/sanei_backend.h"
#ifndef PATH_MAX
#define PATH_MAX 1024
#endif
#include <sane/sanei_config.h>
#include "../include/sane/sanei_config.h"
#define CANON_CONFIG_FILE "canon.conf"
#include <canon.h>

12
backend/canon_dr.c
Wyświetl plik

@ -213,7 +213,7 @@
* @@ Section 1 - Init
*/
#include "sane/config.h"
#include "../include/sane/config.h"
#include <errno.h>
#include <fcntl.h>
@ -232,11 +232,11 @@
# include <libc.h> /* NeXTStep/OpenStep */
#endif
#include "sane/sanei_backend.h"
#include "sane/sanei_scsi.h"
#include "sane/sanei_usb.h"
#include "sane/saneopts.h"
#include "sane/sanei_config.h"
#include "../include/sane/sanei_backend.h"
#include "../include/sane/sanei_scsi.h"
#include "../include/sane/sanei_usb.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_config.h"
#include "canon_dr-cmd.h"
#include "canon_dr.h"

10
backend/cardscan.c
Wyświetl plik

@ -203,7 +203,7 @@ four times {
* @@ Section 1 - Init
*/
#include "sane/config.h"
#include "../include/sane/config.h"
#include <errno.h>
#include <fcntl.h>
@ -222,10 +222,10 @@ four times {
# include <libc.h> /* NeXTStep/OpenStep */
#endif
#include "sane/sanei_backend.h"
#include "sane/sanei_usb.h"
#include "sane/saneopts.h"
#include "sane/sanei_config.h"
#include "../include/sane/sanei_backend.h"
#include "../include/sane/sanei_usb.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_config.h"
#include "cardscan.h"

18
backend/coolscan.c
Wyświetl plik

@ -68,7 +68,7 @@
# include "lalloca.h" /* MUST come first for AIX! */
#endif
#include "sane/config.h"
#include "../include/sane/config.h"
#include "lalloca.h"
#include <errno.h>
@ -83,16 +83,16 @@
#include <sys/types.h>
#include <unistd.h>
#include "sane/sane.h"
#include "sane/sanei.h"
#include "sane/saneopts.h"
#include "sane/sanei_scsi.h"
#include "sane/sanei_debug.h"
#include "sane/sanei_thread.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_scsi.h"
#include "../include/sane/sanei_debug.h"
#include "../include/sane/sanei_thread.h"
#include "sane/sanei_config.h"
#include "../include/sane/sanei_config.h"
#define COOLSCAN_CONFIG_FILE "coolscan.conf"
#include "sane/sanei_backend.h"
#include "../include/sane/sanei_backend.h"
#include "coolscan.h"
#include "coolscan-scsidef.h"

2
backend/coolscan2.c
Wyświetl plik

@ -85,7 +85,7 @@
#include <sys/types.h>
*/
#include "_stdint.h"
#include "../include/_stdint.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"

18
backend/coolscan3.c
Wyświetl plik

@ -30,18 +30,18 @@
#include <unistd.h>
#include <time.h>
#include "_stdint.h"
#include "../include/_stdint.h"
#include <sane/sane.h>
#include <sane/sanei.h>
#include <sane/saneopts.h>
#include <sane/sanei_scsi.h>
#include <sane/sanei_usb.h>
#include <sane/sanei_debug.h>
#include <sane/sanei_config.h>
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_scsi.h"
#include "../include/sane/sanei_usb.h"
#include "../include/sane/sanei_debug.h"
#include "../include/sane/sanei_config.h"
#define BACKEND_NAME coolscan3
#include <sane/sanei_backend.h> /* must be last */
#include "../include/sane/sanei_backend.h" /* must be last */
#define CS3_VERSION_MAJOR 1
#define CS3_VERSION_MINOR 0

12
backend/dc210.c
Wyświetl plik

@ -57,7 +57,7 @@
***************************************************************************/
#include "sane/config.h"
#include "../include/sane/config.h"
#include <stdlib.h>
#include <string.h>
@ -65,15 +65,15 @@
#include <unistd.h>
#include <fcntl.h>
#include <limits.h>
#include "sane/sanei_jpeg.h"
#include "../include/sane/sanei_jpeg.h"
#include <sys/ioctl.h>
#include "sane/sane.h"
#include "sane/sanei.h"
#include "sane/saneopts.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"
#include "../include/sane/saneopts.h"
#define BACKEND_NAME dc210
#include "sane/sanei_backend.h"
#include "../include/sane/sanei_backend.h"
#include "dc210.h"

12
backend/dc240.c
Wyświetl plik

@ -60,7 +60,7 @@
***************************************************************************/
#include "sane/config.h"
#include "../include/sane/config.h"
#include <stdlib.h>
#include <string.h>
@ -68,15 +68,15 @@
#include <unistd.h>
#include <fcntl.h>
#include <limits.h>
#include "sane/sanei_jpeg.h"
#include "../include/sane/sanei_jpeg.h"
#include <sys/ioctl.h>
#include "sane/sane.h"
#include "sane/sanei.h"
#include "sane/saneopts.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"
#include "../include/sane/saneopts.h"
#define BACKEND_NAME dc240
#include "sane/sanei_backend.h"
#include "../include/sane/sanei_backend.h"
#include "dc240.h"

10
backend/dc25.c
Wyświetl plik

@ -89,7 +89,7 @@
***************************************************************************/
#include "sane/config.h"
#include "../include/sane/config.h"
#include <stdlib.h>
#include <string.h>
@ -98,12 +98,12 @@
#include <fcntl.h>
#include <limits.h>
#include "sane/sane.h"
#include "sane/sanei.h"
#include "sane/saneopts.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"
#include "../include/sane/saneopts.h"
#define BACKEND_NAME dc25
#include "sane/sanei_backend.h"
#include "../include/sane/sanei_backend.h"
#include "dc25.h"

10
backend/dll.c
Wyświetl plik

@ -57,7 +57,7 @@
#include <posix/dirent.h>
#endif
#include "sane/config.h"
#include "../include/sane/config.h"
#include "lalloca.h"
#include <errno.h>
@ -98,11 +98,11 @@
#include <sys/stat.h>
#include <dirent.h>
#include "sane/sane.h"
#include "sane/sanei.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"
#define BACKEND_NAME dll
#include "sane/sanei_backend.h"
#include "../include/sane/sanei_backend.h"
#ifndef PATH_MAX
# define PATH_MAX 1024
@ -119,7 +119,7 @@
#endif
#include "sane/sanei_config.h"
#include "../include/sane/sanei_config.h"
#define DLL_CONFIG_FILE "dll.conf"
#define DLL_ALIASES_FILE "dll.aliases"

14
backend/dmc.c
Wyświetl plik

@ -46,27 +46,27 @@
/* $Id$ */
#include "sane/config.h"
#include "../include/sane/config.h"
#include <limits.h>
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
#include "_stdint.h"
#include "../include/_stdint.h"
#include "sane/sane.h"
#include "sane/saneopts.h"
#include "sane/sanei_scsi.h"
#include "../include/sane/sane.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_scsi.h"
#define BACKEND_NAME dmc
#include "sane/sanei_backend.h"
#include "../include/sane/sanei_backend.h"
#ifndef PATH_MAX
# define PATH_MAX 1024
#endif
#include "sane/sanei_config.h"
#include "../include/sane/sanei_config.h"
#define DMC_CONFIG_FILE "dmc.conf"
#include "dmc.h"

10
backend/epjitsu.c
Wyświetl plik

@ -151,7 +151,7 @@
* @@ Section 1 - Init
*/
#include "sane/config.h"
#include "../include/sane/config.h"
#include <errno.h>
#include <fcntl.h>
@ -170,10 +170,10 @@
# include <libc.h> /* NeXTStep/OpenStep */
#endif
#include "sane/sanei_backend.h"
#include "sane/sanei_usb.h"
#include "sane/saneopts.h"
#include "sane/sanei_config.h"
#include "../include/sane/sanei_backend.h"
#include "../include/sane/sanei_usb.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_config.h"
#include "epjitsu.h"
#include "epjitsu-cmd.h"

16
backend/epson.c
Wyświetl plik

@ -305,7 +305,7 @@
#define SANE_I18N(text) (text)
#endif
#include "sane/config.h"
#include "../include/sane/config.h"
#include <lalloca.h>
@ -318,18 +318,18 @@
#include <unistd.h>
#include <errno.h>
#include "sane/sane.h"
#include "sane/saneopts.h"
#include "sane/sanei_scsi.h"
#include "../include/sane/sane.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_scsi.h"
#include "sane/sanei_usb.h"
#include "../include/sane/sanei_usb.h"
#include <sane/sanei_pio.h>
#include "../include/sane/sanei_pio.h"
#define BACKEND_NAME epson
#include <sane/sanei_backend.h>
#include "../include/sane/sanei_backend.h"
#include <sane/sanei_config.h>
#include "../include/sane/sanei_config.h"
#include "epson.h"
#include "epson_scsi.h"

8
backend/epson2-io.c
Wyświetl plik

@ -28,10 +28,10 @@
#include "epson2.h"
#include "epson2-io.h"
#include <sane/sanei_scsi.h>
#include <sane/sanei_usb.h>
#include <sane/sanei_pio.h>
#include <sane/sanei_tcp.h>
#include "../include/sane/sanei_scsi.h"
#include "../include/sane/sanei_usb.h"
#include "../include/sane/sanei_pio.h"
#include "../include/sane/sanei_tcp.h"
#include "epson2_scsi.h"
#include "epson_usb.h"

16
backend/epson2.c
Wyświetl plik

@ -57,14 +57,14 @@
#include <byteorder.h>
#include <sane/saneopts.h>
#include <sane/sanei_scsi.h>
#include <sane/sanei_usb.h>
#include <sane/sanei_pio.h>
#include <sane/sanei_tcp.h>
#include <sane/sanei_udp.h>
#include <sane/sanei_backend.h>
#include <sane/sanei_config.h>
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_scsi.h"
#include "../include/sane/sanei_usb.h"
#include "../include/sane/sanei_pio.h"
#include "../include/sane/sanei_tcp.h"
#include "../include/sane/sanei_udp.h"
#include "../include/sane/sanei_backend.h"
#include "../include/sane/sanei_config.h"
#include "epson2-io.h"
#include "epson2-commands.h"

6
backend/epson2.h
Wyświetl plik

@ -25,9 +25,9 @@
#include <sys/ioctl.h>
#include <sys/types.h>
#include <sane/sane.h>
#include <sane/sanei_backend.h>
#include <sane/sanei_debug.h>
#include "../include/sane/sane.h"
#include "../include/sane/sanei_backend.h"
#include "../include/sane/sanei_debug.h"
#ifdef __GNUC__
#define __func__ __FUNCTION__

12
backend/epson2_net.c
Wyświetl plik

@ -16,18 +16,18 @@
#undef BACKEND_NAME
#define BACKEND_NAME epson2_net
#include <sane/sane.h>
#include <sane/saneopts.h>
#include <sane/sanei_tcp.h>
#include <sane/sanei_config.h>
#include <sane/sanei_backend.h>
#include "../include/sane/sane.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_tcp.h"
#include "../include/sane/sanei_config.h"
#include "../include/sane/sanei_backend.h"
#include "epson2.h"
#include "epson2_net.h"
#include "byteorder.h"
#include <sane/sanei_debug.h>
#include "../include/sane/sanei_debug.h"
#ifdef HAVE_STDDEF_H
#include <stddef.h>

2
backend/epson2_net.h
Wyświetl plik

@ -2,7 +2,7 @@
#define _EPSON2_NET_H_
#include <sys/types.h>
#include <sane/sane.h>
#include "../include/sane/sane.h"
extern int sanei_epson_net_read(struct Epson_Scanner *s, unsigned char *buf, size_t buf_size,
SANE_Status *status);

4
backend/epson2_scsi.c
Wyświetl plik

@ -2,8 +2,8 @@
#define BACKEND_NAME epson2_scsi
#include "../include/sane/config.h"
#include <sane/sanei_debug.h>
#include <sane/sanei_scsi.h>
#include "../include/sane/sanei_debug.h"
#include "../include/sane/sanei_scsi.h"
#include "epson2_scsi.h"
#ifdef HAVE_STDDEF_H

2
backend/epson2_scsi.h
Wyświetl plik

@ -2,7 +2,7 @@
#define _EPSON2_SCSI_H_
#include <sys/types.h>
#include <sane/sane.h>
#include "../include/sane/sane.h"
#define TEST_UNIT_READY_COMMAND (0x00)
#define READ_6_COMMAND (0x08)

4
backend/epson_scsi.c
Wyświetl plik

@ -4,8 +4,8 @@
#undef BACKEND_NAME
#define BACKEND_NAME epson_scsi
#include "../include/sane/config.h"
#include <sane/sanei_debug.h>
#include <sane/sanei_scsi.h>
#include "../include/sane/sanei_debug.h"
#include "../include/sane/sanei_scsi.h"
#include "epson_scsi.h"
#include "../include/lalloca.h"

2
backend/epson_scsi.h
Wyświetl plik

@ -2,7 +2,7 @@
#define _EPSON_SCSI_H_
#include <sys/types.h>
#include <sane/sane.h>
#include "../include/sane/sane.h"
#define TEST_UNIT_READY_COMMAND (0x00)
#define READ_6_COMMAND (0x08)

2
backend/epson_usb.c
Wyświetl plik

@ -1,5 +1,5 @@
#include <sys/types.h>
#include <sane/sanei_usb.h>
#include "../include/sane/sanei_usb.h"
#include "epson_usb.h"

12
backend/fujitsu.c
Wyświetl plik

@ -461,7 +461,7 @@
* @@ Section 1 - Init
*/
#include "sane/config.h"
#include "../include/sane/config.h"
#include <errno.h>
#include <fcntl.h>
@ -480,11 +480,11 @@
# include <libc.h> /* NeXTStep/OpenStep */
#endif
#include "sane/sanei_backend.h"
#include "sane/sanei_scsi.h"
#include "sane/sanei_usb.h"
#include "sane/saneopts.h"
#include "sane/sanei_config.h"
#include "../include/sane/sanei_backend.h"
#include "../include/sane/sanei_scsi.h"
#include "../include/sane/sanei_usb.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_config.h"
#include "fujitsu-scsi.h"
#include "fujitsu.h"

2
backend/genesys.c
Wyświetl plik

@ -69,7 +69,7 @@
#include "../include/sane/sanei_backend.h"
#include "../include/sane/sanei_usb.h"
#include "../include/sane/sanei_config.h"
#include "_stdint.h"
#include "../include/_stdint.h"
#include "genesys.h"
#include "genesys_devices.c"

2
backend/genesys_gl646.c
Wyświetl plik

@ -68,7 +68,7 @@
#include "../include/sane/sanei_config.h"
#include "../include/sane/sanei_usb.h"
#include "_stdint.h"
#include "../include/_stdint.h"
#include "genesys.h"
/* Individual bits */

2
backend/genesys_gl841.c
Wyświetl plik

@ -58,7 +58,7 @@
#include <string.h>
#include <errno.h>
#include <unistd.h>
#include "_stdint.h"
#include "../include/_stdint.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"

12
backend/gphoto2.c
Wyświetl plik

@ -77,7 +77,7 @@
***************************************************************************/
#include "sane/config.h"
#include "../include/sane/config.h"
#include <stdlib.h>
#include <string.h>
@ -85,15 +85,15 @@
#include <unistd.h>
#include <fcntl.h>
#include <limits.h>
#include "sane/sanei_jpeg.h"
#include "../include/sane/sanei_jpeg.h"
#include <sys/ioctl.h>
#include "sane/sane.h"
#include "sane/sanei.h"
#include "sane/saneopts.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"
#include "../include/sane/saneopts.h"
#define BACKEND_NAME gphoto2
#include "sane/sanei_backend.h"
#include "../include/sane/sanei_backend.h"
/* PSF 1/12/02 - gphoto2.h does a #include of config.h. We don't have
* config.h by that name (we call it sane/config.h), so the #undef of

2
backend/gt68xx.c
Wyświetl plik

@ -95,7 +95,7 @@
#include <math.h>
#include <dirent.h>
#include "_stdint.h"
#include "../include/_stdint.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"

2
backend/hp-accessor.c
Wyświetl plik

@ -46,7 +46,7 @@
extern int sanei_debug_hp; */
#define DEBUG_DECLARE_ONLY
#include "sane/config.h"
#include "../include/sane/config.h"
#include "../include/lassert.h"
#include <string.h>

2
backend/hp-device.c
Wyświetl plik

@ -45,7 +45,7 @@
/*#define STUBS
extern int sanei_debug_hp;*/
#define DEBUG_DECLARE_ONLY
#include "sane/config.h"
#include "../include/sane/config.h"
#include <stdlib.h>
#include <string.h>

6
backend/hp-handle.c
Wyświetl plik

@ -45,7 +45,7 @@
/* #define STUBS
extern int sanei_debug_hp; */
#define DEBUG_DECLARE_ONLY
#include "sane/config.h"
#include "../include/sane/config.h"
#ifdef HAVE_UNISTD_H
# include <unistd.h>
@ -59,8 +59,8 @@ extern int sanei_debug_hp; */
#include "hp-handle.h"
#include "sane/sanei_backend.h"
#include "sane/sanei_thread.h"
#include "../include/sane/sanei_backend.h"
#include "../include/sane/sanei_thread.h"
#include "hp-device.h"
#include "hp-option.h"

2
backend/hp-hpmem.c
Wyświetl plik

@ -45,7 +45,7 @@
#define STUBS
extern int sanei_debug_hp;*/
#define DEBUG_DECLARE_ONLY
#include "sane/config.h"
#include "../include/sane/config.h"
#include <stdlib.h>
#include <string.h>

6
backend/hp-option.c
Wyświetl plik

@ -68,7 +68,7 @@
#define STUBS
extern int sanei_debug_hp; */
#define DEBUG_DECLARE_ONLY
#include "sane/config.h"
#include "../include/sane/config.h"
#include "../include/lalloca.h"
#include <stdio.h>
@ -81,8 +81,8 @@ extern int sanei_debug_hp; */
#include <stdlib.h>
#include <unistd.h>
#include <math.h>
#include "sane/saneopts.h"
#include "sane/sanei.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei.h"
#include "hp.h"
#include "hp-option.h"
#include "hp-accessor.h"

10
backend/hp-scl.c
Wyświetl plik

@ -64,7 +64,7 @@
#define STUBS
extern int sanei_debug_hp;*/
#define DEBUG_DECLARE_ONLY
#include "sane/config.h"
#include "../include/sane/config.h"
#include "../include/lalloca.h" /* Must be first */
#ifdef HAVE_UNISTD_H
@ -80,13 +80,13 @@ extern int sanei_debug_hp;*/
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include "sane/sanei_scsi.h"
#include "sane/sanei_usb.h"
#include "sane/sanei_pio.h"
#include "../include/sane/sanei_scsi.h"
#include "../include/sane/sanei_usb.h"
#include "../include/sane/sanei_pio.h"
#include "hp.h"
#include "sane/sanei_backend.h"
#include "../include/sane/sanei_backend.h"
#include "hp-option.h"
#include "hp-scsi.h"

14
backend/hp.c
Wyświetl plik

@ -232,17 +232,17 @@ static char *hp_backend_revision = "$Revision$";
#define VERSIO 8
#include "sane/config.h"
#include "../include/sane/config.h"
#include "hp.h"
#include <string.h>
/* #include <sys/types.h> */
/* #include <sane/sane.h> */
#include "sane/sanei_config.h"
#include "sane/sanei_backend.h"
#include "sane/sanei_usb.h"
#include "sane/sanei_thread.h"
/* #include <sane/sanei_debug.h> */
/* #include "../include/sane/sane.h" */
#include "../include/sane/sanei_config.h"
#include "../include/sane/sanei_backend.h"
#include "../include/sane/sanei_usb.h"
#include "../include/sane/sanei_thread.h"
/* #include "../include/sane/sanei_debug.h" */
#include "hp-device.h"
#include "hp-handle.h"

4
backend/hp.h
Wyświetl plik

@ -46,12 +46,12 @@
#define HP_H_INCLUDED
#include <limits.h>
#include <sys/types.h>
#include "sane/sane.h"
#include "../include/sane/sane.h"
#undef BACKEND_NAME
#define BACKEND_NAME hp
#define DEBUG_NOT_STATIC
#include "sane/sanei_debug.h"
#include "../include/sane/sanei_debug.h"
#ifdef __GNUC__
#define UNUSEDARG __attribute__ ((unused))

14
backend/hp3500.c
Wyświetl plik

@ -73,7 +73,7 @@
/* ------------------------------------------------------------------------- */
#include "sane/config.h"
#include "../include/sane/config.h"
#include <errno.h>
#include <fcntl.h>
@ -91,12 +91,12 @@
# include <libc.h> /* NeXTStep/OpenStep */
#endif
#include "sane/sane.h"
#include "sane/sanei_usb.h"
#include "sane/saneopts.h"
#include "sane/sanei_config.h"
#include "sane/sanei_thread.h"
#include "sane/sanei_backend.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei_usb.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_config.h"
#include "../include/sane/sanei_thread.h"
#include "../include/sane/sanei_backend.h"
#define RTCMD_GETREG 0x80
#define RTCMD_READSRAM 0x81

10
backend/hp5590.c
Wyświetl plik

@ -42,17 +42,17 @@
This file is part of a SANE backend for HP 4570/5550/5590/7650 Scanners
*/
#include "sane/config.h"
#include "../include/sane/config.h"
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include "sane/sane.h"
#include "../include/sane/sane.h"
#define BACKEND_NAME hp5590
#include "sane/sanei_backend.h"
#include "sane/sanei_usb.h"
#include "sane/saneopts.h"
#include "../include/sane/sanei_backend.h"
#include "../include/sane/sanei_usb.h"
#include "../include/sane/saneopts.h"
#include "hp5590_cmds.c"
#include "hp5590_low.c"

4
backend/hp5590_cmds.c
Wyświetl plik

@ -42,7 +42,7 @@
This file is part of a SANE backend for HP 4570/5550/5590/7650 Scanners
*/
#include "sane/config.h"
#include "../include/sane/config.h"
#ifdef HAVE_UNISTD_H
# include <unistd.h>
@ -53,7 +53,7 @@
#include <errno.h>
#include <string.h>
#include "sane/sanei_debug.h"
#include "../include/sane/sanei_debug.h"
#include "hp5590_low.h"
#include "hp5590_cmds.h"

6
backend/hp5590_low.c
Wyświetl plik

@ -41,7 +41,7 @@
This file is part of a SANE backend for HP 4570/5550/5590/7650 Scanners
*/
#include "sane/config.h"
#include "../include/sane/config.h"
#include <stdio.h>
#include <string.h>
@ -50,8 +50,8 @@
# include <netinet/in.h>
#endif /* HAVE_NETINET_IN_H */
#include "sane/sanei_debug.h"
#include "sane/sanei_usb.h"
#include "../include/sane/sanei_debug.h"
#include "../include/sane/sanei_usb.h"
#include "hp5590_low.h"
/* Debug levels */

2
backend/hp5590_low.h
Wyświetl plik

@ -44,7 +44,7 @@
#ifndef HP5590_LOW_H
#define HP5590_LOW_H
#include "sane/sane.h"
#include "../include/sane/sane.h"
/* Flags for hp5590_cmd() */
#define CMD_IN 1 << 0 /* Indicates IN direction, otherwise - OUT */

2
backend/lexmark_low.c
Wyświetl plik

@ -54,7 +54,7 @@
#include <unistd.h>
#include <math.h>
#include "_stdint.h"
#include "../include/_stdint.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"

16
backend/microtek.c
Wyświetl plik

@ -57,7 +57,7 @@
#define MICROTEK_MINOR 13
#define MICROTEK_PATCH 1
#include "sane/config.h"
#include "../include/sane/config.h"
#include <stdlib.h>
#include <string.h>
@ -65,16 +65,16 @@
#include <fcntl.h>
#include <math.h>
#include "_stdint.h"
#include "../include/_stdint.h"
#include "sane/sane.h"
#include "sane/sanei.h"
#include "sane/sanei_config.h"
#include "sane/sanei_scsi.h"
#include "sane/saneopts.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"
#include "../include/sane/sanei_config.h"
#include "../include/sane/sanei_scsi.h"
#include "../include/sane/saneopts.h"
#define BACKEND_NAME microtek
#include "sane/sanei_backend.h"
#include "../include/sane/sanei_backend.h"
#include "microtek.h"

2
backend/microtek2.c
Wyświetl plik

@ -72,7 +72,7 @@
#include <errno.h>
#include <math.h>
#include "_stdint.h"
#include "../include/_stdint.h"
#ifdef HAVE_AUTHORIZATION
#include <sys/stat.h>

2
backend/mustek.c
Wyświetl plik

@ -66,7 +66,7 @@
#include <sys/time.h>
#include <sys/types.h>
#include "_stdint.h"
#include "../include/_stdint.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"

12
backend/nec.c
Wyświetl plik

@ -63,7 +63,7 @@
MultiReder 600U/600S series not available
MultiReader PetiScan series not available
*/
#include "sane/config.h"
#include "../include/sane/config.h"
#include <limits.h>
#include <stdlib.h>
@ -73,9 +73,9 @@
#include <errno.h>
#include <math.h>
#include "sane/sane.h"
#include "sane/saneopts.h"
#include "sane/sanei_scsi.h"
#include "../include/sane/sane.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_scsi.h"
/* QUEUEDEBUG should be undefined unless you want to play
with the sanei_scsi.c under Linux and/or with the Linux's SG driver,
@ -122,7 +122,7 @@
/* #define USE_RESOLUTION_LIST */
#define BACKEND_NAME nec
#include "sane/sanei_backend.h"
#include "../include/sane/sanei_backend.h"
#ifndef PATH_MAX
#define PATH_MAX 1024
@ -133,7 +133,7 @@
#define PIX_TO_MM(x, mud) ((x) * 25.4 / mud)
#define MM_TO_PIX(x, mud) ((x) * mud / 25.4)
#include "sane/sanei_config.h"
#include "../include/sane/sanei_config.h"
#define NEC_CONFIG_FILE "nec.conf"
#include "nec.h"

16
backend/pie.c
Wyświetl plik

@ -69,7 +69,7 @@
* 27-9-2000 went public with build 4
*/
#include "sane/config.h"
#include "../include/sane/config.h"
#include <errno.h>
#include <fcntl.h>
@ -82,15 +82,15 @@
#include <sys/wait.h>
#include <unistd.h>
#include "sane/sane.h"
#include "sane/sanei.h"
#include "sane/saneopts.h"
#include "sane/sanei_scsi.h"
#include "sane/sanei_debug.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_scsi.h"
#include "../include/sane/sanei_debug.h"
#define BACKEND_NAME pie
#include "sane/sanei_backend.h"
#include "sane/sanei_config.h"
#include "../include/sane/sanei_backend.h"
#include "../include/sane/sanei_config.h"
# include "../include/sane/sanei_thread.h"

10
backend/pint.c
Wyświetl plik

@ -39,26 +39,26 @@
whether to permit this exception to apply to your modifications.
If you do not wish that, delete this exception notice. */
#include "sane/config.h"
#include "../include/sane/config.h"
#include <limits.h>
#include <stdlib.h>
#include <string.h>
extern int errno;
#include "sane/sane.h"
#include "sane/saneopts.h"
#include "../include/sane/sane.h"
#include "../include/sane/saneopts.h"
#include <unistd.h>
#include <fcntl.h>
#include "sane/sanei_backend.h"
#include "../include/sane/sanei_backend.h"
#ifndef PATH_MAX
# define PATH_MAX 1024
#endif
#include "sane/sanei_config.h"
#include "../include/sane/sanei_config.h"
#define PINT_CONFIG_FILE "pint.conf"
#include "pint.h"

4
backend/plustek-usbio.c
Wyświetl plik

@ -70,8 +70,8 @@
* <hr>
*/
#include "sane/sanei_usb.h"
#include "sane/sanei_lm983x.h"
#include "../include/sane/sanei_usb.h"
#include "../include/sane/sanei_lm983x.h"
#define _UIO(func) \
{ \

12
backend/qcam.c
Wyświetl plik

@ -70,7 +70,7 @@
# include "lalloca.h" /* MUST come first for AIX! */
#endif
#include "sane/config.h"
#include "../include/sane/config.h"
#include "lalloca.h"
#include <assert.h>
@ -88,19 +88,19 @@
#include <sys/wait.h>
#include <unistd.h>
#include "sane/sane.h"
#include "sane/sanei.h"
#include "sane/saneopts.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"
#include "../include/sane/saneopts.h"
#define BACKEND_NAME qcam
#include "sane/sanei_backend.h"
#include "../include/sane/sanei_backend.h"
#ifndef PATH_MAX
# define PATH_MAX 1024
#endif
#include "sane/sanei_config.h"
#include "../include/sane/sanei_config.h"
#define QCAM_CONFIG_FILE "qcam.conf"
#include "qcam.h"

2
backend/qcam.h
Wyświetl plik

@ -50,7 +50,7 @@
#ifndef qcam_h
#define qcam_h
#include <sane/sane.h>
#include "../include/sane/sane.h"
typedef enum
{

12
backend/ricoh.c
Wyświetl plik

@ -44,7 +44,7 @@
This file implements a SANE backend for Ricoh flatbed scanners.
*/
#include "sane/config.h"
#include "../include/sane/config.h"
#include <limits.h>
#include <stdlib.h>
@ -55,18 +55,18 @@
#include <unistd.h>
#include <ctype.h>
#include "sane/sane.h"
#include "sane/saneopts.h"
#include "sane/sanei_scsi.h"
#include "../include/sane/sane.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_scsi.h"
#define BACKEND_NAME ricoh
#include "sane/sanei_backend.h"
#include "../include/sane/sanei_backend.h"
#ifndef PATH_MAX
# define PATH_MAX 1024
#endif
#include "sane/sanei_config.h"
#include "../include/sane/sanei_config.h"
#define RICOH_CONFIG_FILE "ricoh.conf"
#include "ricoh.h"

2
backend/rts88xx_lib.c
Wyświetl plik

@ -55,7 +55,7 @@
#include <stdio.h>
#include <sys/time.h>
#include "_stdint.h"
#include "../include/_stdint.h"
#define RTS88XX_LIB_BUILD 30

14
backend/s9036.c
Wyświetl plik

@ -20,7 +20,7 @@
This file implements a SANE backend for Siemens 9036 flatbed scanners. */
#include "sane/config.h"
#include "../include/sane/config.h"
#include <stdlib.h>
#include <unistd.h>
@ -31,15 +31,15 @@
# define PATH_MAX 1024
#endif
#include "sane/sane.h"
#include "sane/sanei.h"
#include "sane/sanei_config.h"
#include "sane/saneopts.h"
#include "sane/sanei_scsi.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"
#include "../include/sane/sanei_config.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_scsi.h"
#include "s9036.h"
#define BACKEND_NAME s9036
#include "sane/sanei_backend.h"
#include "../include/sane/sanei_backend.h"
#define MM_PER_INCH 25.4

10
backend/sharp.c
Wyświetl plik

@ -88,9 +88,9 @@
#include <errno.h>
#include <math.h>
#include <sane/sane.h>
#include <sane/saneopts.h>
#include <sane/sanei_scsi.h>
#include "../include/sane/sane.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_scsi.h"
/* QUEUEDEBUG should be undefined unless you want to play
with the sanei_scsi.c under Linux and/or with the Linux's SG driver,
@ -148,7 +148,7 @@
#define BACKEND_NAME sharp
#include <sane/sanei_backend.h>
#include "../include/sane/sanei_backend.h"
#include <sharp.h>
@ -164,7 +164,7 @@
#define PIX_TO_MM(x, mud) ((x) * 25.4 / mud)
#define MM_TO_PIX(x, mud) ((x) * mud / 25.4)
#include <sane/sanei_config.h>
#include "../include/sane/sanei_config.h"
#define SHARP_CONFIG_FILE "sharp.conf"
static int num_devices = 0;

2
backend/sm3840.h
Wyświetl plik

@ -47,7 +47,7 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <sane/sane.h>
#include "../include/sane/sane.h"
typedef enum SM3840_Option

4
backend/snapscan.c
Wyświetl plik

@ -2295,9 +2295,9 @@ SANE_Status sane_get_select_fd (SANE_Handle h, SANE_Int * fd)
* backend/qcam.c backend/ricoh.c backend/s9036.c backend/snapscan.c
* backend/tamarack.c: Use sanei_config_read instead of fgets.
* * backend/dc210.c backend/microtek.c backend/pnm.c: Added
* #include <sane/config.h>.
* #include "../include/sane/config.h".
* * backend/dc25.c backend/m3096.c backend/sp15.c
* backend/st400.c: Moved #include <sane/config.h> to the beginning.
* backend/st400.c: Moved #include "../include/sane/config.h" to the beginning.
* * AUTHORS: Changed agfa to agfafocus.
*
* Revision 1.1.1.1.2.3 2000/07/17 21:37:28 hmg

16
backend/sp15c.c
Wyświetl plik

@ -122,9 +122,9 @@ static const char RCSid[] = "$Header$";
* backend/qcam.c backend/ricoh.c backend/s9036.c backend/snapscan.c
* backend/tamarack.c: Use sanei_config_read instead of fgets.
* * backend/dc210.c backend/microtek.c backend/pnm.c: Added
* #include <sane/config.h>.
* #include "../include/sane/config.h".
* * backend/dc25.c backend/m3096.c backend/sp15.c
* backend/st400.c: Moved #include <sane/config.h> to the beginning.
* backend/st400.c: Moved #include "../include/sane/config.h" to the beginning.
* * AUTHORS: Changed agfa to agfafocus.
*
* Revision 1.1.2.3 2000/03/14 17:47:12 abel
@ -207,7 +207,7 @@ static const char RCSid[] = "$Header$";
/* ------------------------------------------------------------------------- */
#include "sane/config.h"
#include "../include/sane/config.h"
#include <errno.h>
#include <fcntl.h>
@ -220,11 +220,11 @@ static const char RCSid[] = "$Header$";
#include <sys/types.h>
#include <unistd.h>
#include "sane/sanei_backend.h"
#include "sane/sanei_scsi.h"
#include "sane/saneopts.h"
#include "sane/sanei_config.h"
#include "sane/sanei_thread.h"
#include "../include/sane/sanei_backend.h"
#include "../include/sane/sanei_scsi.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_config.h"
#include "../include/sane/sanei_thread.h"
#include "sp15c-scsi.h"
#include "sp15c.h"

16
backend/st400.c
Wyświetl plik

@ -71,25 +71,25 @@ vim: ts=4 sw=4 noexpandtab
"$HOME/st400.dump" instead of "/tmp/st400.dump".
*/
#include "sane/config.h"
#include "../include/sane/config.h"
#include <sys/types.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <ctype.h>
#include "sane/sane.h"
#include "sane/sanei.h"
#include "sane/sanei_config.h"
#include "sane/saneopts.h"
#include "sane/sanei_scsi.h"
#include "sane/sanei_debug.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"
#include "../include/sane/sanei_config.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_scsi.h"
#include "../include/sane/sanei_debug.h"
#ifndef PATH_MAX
# define PATH_MAX 1024
#endif
#define BACKEND_NAME st400
#include "sane/sanei_backend.h"
#include "../include/sane/sanei_backend.h"
#include "st400.h"

2
backend/stubs.c
Wyświetl plik

@ -1,6 +1,6 @@
#define STUBS
#include "sane/sanei_backend.h"
#include "../include/sane/sanei_backend.h"
/* Now define the wrappers (we could use aliases here, but go for
robustness for now...: */

18
backend/tamarack.c
Wyświetl plik

@ -37,7 +37,7 @@
*/
#include "sane/config.h"
#include "../include/sane/config.h"
#include <errno.h>
#include <fcntl.h>
@ -50,14 +50,14 @@
#include <unistd.h>
#include <sys/time.h>
#include "_stdint.h"
#include "../include/_stdint.h"
#include "sane/sane.h"
#include "sane/sanei.h"
#include "sane/saneopts.h"
#include "sane/sanei_scsi.h"
#include "sane/sanei_thread.h"
#include "sane/sanei_config.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_scsi.h"
#include "../include/sane/sanei_thread.h"
#include "../include/sane/sanei_config.h"
/* For timeval... */
#ifdef DEBUG
@ -66,7 +66,7 @@
#define BACKEND_NAME tamarack
#include "sane/sanei_backend.h"
#include "../include/sane/sanei_backend.h"
#include "tamarack.h"

2
backend/test.c
Wyświetl plik

@ -59,7 +59,7 @@
#include <unistd.h>
#include <fcntl.h>
#include "_stdint.h"
#include "../include/_stdint.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"

2
backend/umax-usb.c
Wyświetl plik

@ -51,7 +51,7 @@
#include "../include/sane/sanei_usb.h"
#include "sane/sanei_pv8630.h"
#include "../include/sane/sanei_pv8630.h"
/* USB specific parts */

18
backend/umax.c
Wyświetl plik

@ -111,7 +111,7 @@ in ADF mode this is done often:
/* ------------------------------------------------------------ INCLUDES ----------------------------------- */
#include "sane/config.h"
#include "../include/sane/config.h"
#include <errno.h>
#include <fcntl.h>
@ -124,14 +124,14 @@ in ADF mode this is done often:
#include <sys/wait.h>
#include <unistd.h>
#include "sane/sane.h"
#include "sane/sanei.h"
#include "sane/saneopts.h"
#include "sane/sanei_scsi.h"
#include "sane/sanei_debug.h"
#include "sane/sanei_backend.h"
#include "sane/sanei_config.h"
#include "sane/sanei_thread.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_scsi.h"
#include "../include/sane/sanei_debug.h"
#include "../include/sane/sanei_backend.h"
#include "../include/sane/sanei_config.h"
#include "../include/sane/sanei_thread.h"
#ifdef UMAX_ENABLE_USB
# include "sane/sanei_usb.h"

14
backend/xerox_mfp.c
Wyświetl plik

@ -16,14 +16,14 @@
#include <math.h>
#include <unistd.h>
#include <sys/time.h>
#include <sane/sane.h>
#include <sane/sanei.h>
#include <sane/saneopts.h>
#include <sane/sanei_thread.h>
#include <sane/sanei_usb.h>
#include <sane/sanei_config.h>
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_thread.h"
#include "../include/sane/sanei_usb.h"
#include "../include/sane/sanei_config.h"
#define BACKEND_NAME xerox_mfp
#include <sane/sanei_backend.h>
#include "../include/sane/sanei_backend.h"
#include "xerox_mfp.h"
#define BACKEND_BUILD 10

2
frontend/scanimage.c
Wyświetl plik

@ -41,7 +41,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include "_stdint.h"
#include "../include/_stdint.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"

6
sanei/sanei_DomainOS.c
Wyświetl plik

@ -83,11 +83,11 @@ DBG levels:
#include <apollo/pfm.h>
#include <apollo/scsi.h>
#include "sane/config.h"
#include "../include/sane/config.h"
#include "sane/sanei_scsi.h"
#include "../include/sane/sanei_scsi.h"
#include "sane/sanei_debug.h"
#include "../include/sane/sanei_debug.h"
#include "sanei_DomainOS.h"

12
sanei/sanei_ab306.c
Wyświetl plik

@ -41,7 +41,7 @@
This file implements the Mustek-proprietary SCSI-over-parallel-port
interface. */
#include "sane/config.h"
#include "../include/sane/config.h"
#ifdef HAVE_UNISTD_H
# include <unistd.h>
@ -74,9 +74,9 @@ inb (u_long port)
# define IO_SUPPORT_MISSING
#endif
#include "sane/sane.h"
#include "sane/sanei.h"
#include "sane/sanei_ab306.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"
#include "../include/sane/sanei_ab306.h"
#if (defined(HAVE_IOPERM) || defined(__FreeBSD__)) && !defined(IO_SUPPORT_MISSING)
@ -91,10 +91,10 @@ inb (u_long port)
#include <sys/wait.h>
#include <unistd.h>
#include "sane/saneopts.h"
#include "../include/sane/saneopts.h"
#define BACKEND_NAME sanei_ab306
#include "sane/sanei_debug.h"
#include "../include/sane/sanei_debug.h"
#define PORT_DEV "/dev/port"
#define AB306_CIO 0x379 /* control i/o port */

2
sanei/sanei_codec_ascii.c
Wyświetl plik

@ -38,7 +38,7 @@
whether to permit this exception to apply to your modifications.
If you do not wish that, delete this exception notice. */
#include "sane/config.h"
#include "../include/sane/config.h"
#include <ctype.h>
#include <errno.h>

8
sanei/sanei_config.c
Wyświetl plik

@ -40,7 +40,7 @@
This file provides generic configuration support. */
#include "sane/config.h"
#include "../include/sane/config.h"
#include <ctype.h>
#include <stdio.h>
@ -49,11 +49,11 @@
#include <sys/param.h>
#include "sane/sanei.h"
#include "sane/sanei_config.h"
#include "../include/sane/sanei.h"
#include "../include/sane/sanei_config.h"
#define BACKEND_NAME sanei_config
#include "sane/sanei_debug.h"
#include "../include/sane/sanei_debug.h"
#ifndef PATH_MAX
# define PATH_MAX 1024

8
sanei/sanei_config2.c
Wyświetl plik

@ -40,7 +40,7 @@
This file provides generic configuration support. */
#include "sane/config.h"
#include "../include/sane/config.h"
#include <ctype.h>
#include <stdio.h>
@ -53,9 +53,9 @@
#include <drivers/USB_scanner.h>
#endif
#include "sane/sanei.h"
#include "sane/sanei_config.h"
#include "sane/sanei_scsi.h"
#include "../include/sane/sanei.h"
#include "../include/sane/sanei_config.h"
#include "../include/sane/sanei_scsi.h"
/* This logically belongs to sanei_config.c but not every backend that
uses sanei_config() wants to depend on this function. */

2
sanei/sanei_jpeg.c
Wyświetl plik

@ -7,7 +7,7 @@
#ifdef HAVE_LIBJPEG
#include "sane/sanei_jpeg.h"
#include "../include/sane/sanei_jpeg.h"
typedef struct
{

14
sanei/sanei_pa4s2.c
Wyświetl plik

@ -53,10 +53,10 @@
These debug levels can be set using the environment variable
SANE_DEBUG_SANEI_PA4S2 */
#include "sane/config.h"
#include "../include/sane/config.h"
#define BACKEND_NAME sanei_pa4s2
#include "sane/sanei_backend.h" /* pick up compatibility defs */
#include "../include/sane/sanei_backend.h" /* pick up compatibility defs */
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@ -109,9 +109,9 @@ inb (u_long port)
#endif /* HAVE_LIBIEEE1284 */
#include "sane/sane.h"
#include "sane/sanei.h"
#include "sane/sanei_pa4s2.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"
#include "../include/sane/sanei_pa4s2.h"
#ifdef NDEBUG
@ -161,7 +161,7 @@ static int sanei_pa4s2_dbg_init_called = SANE_FALSE;
# include <sys/types.h>
#endif
#include "sane/saneopts.h"
#include "../include/sane/saneopts.h"
#if (defined (HAVE_IOPERM) || defined (HAVE_LIBIEEE1284)) && !defined (IO_SUPPORT_MISSING)
@ -180,7 +180,7 @@ static int sanei_pa4s2_dbg_init_called = SANE_FALSE;
# include <sys/types.h>
#endif
#include "sane/saneopts.h"
#include "../include/sane/saneopts.h"
#define PA4S2_MODE_NIB 0
#define PA4S2_MODE_UNI 1

12
sanei/sanei_pio.c
Wyświetl plik

@ -49,10 +49,10 @@
debug levels.
*/
#include "sane/config.h"
#include "../include/sane/config.h"
#define BACKEND_NAME sanei_pio
#include "sane/sanei_backend.h" /* pick up compatibility defs */
#include "../include/sane/sanei_backend.h" /* pick up compatibility defs */
#ifdef HAVE_UNISTD_H
# include <unistd.h>
@ -85,9 +85,9 @@ inb (u_long port)
# define IO_SUPPORT_MISSING
#endif
#include "sane/sane.h"
#include "sane/sanei.h"
#include "sane/sanei_pio.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"
#include "../include/sane/sanei_pio.h"
#if defined (HAVE_IOPERM) && !defined (IO_SUPPORT_MISSING)
@ -103,7 +103,7 @@ inb (u_long port)
#include <unistd.h>
#include <time.h>
#include "sane/saneopts.h"
#include "../include/sane/saneopts.h"
#define PORT_DEV "/dev/port"

12
sanei/test_wire.c
Wyświetl plik

@ -1,4 +1,4 @@
#include "sane/config.h"
#include "../include/sane/config.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -6,11 +6,11 @@
#include <sys/fcntl.h>
#include "sane/sane.h"
#include "sane/sanei.h"
#include "sane/sanei_wire.h"
#include "sane/sanei_codec_ascii.h"
#include "sane/sanei_codec_bin.h"
#include "../include/sane/sane.h"
#include "../include/sane/sanei.h"
#include "../include/sane/sanei_wire.h"
#include "../include/sane/sanei_codec_ascii.h"
#include "../include/sane/sanei_codec_bin.h"
static Wire w;

2
tools/check-usb-chip.c
Wyświetl plik

@ -37,7 +37,7 @@
#include <usb.h>
#include "_stdint.h"
#include "../include/_stdint.h"
static int verbose = 0;
static SANE_Bool no_chipset_access;