config.h   config.h 
skipping to change at line 93 skipping to change at line 93
/* Define if your locale.h file contains LC_MESSAGES. */ /* Define if your locale.h file contains LC_MESSAGES. */
/* #undef HAVE_LC_MESSAGES */ /* #undef HAVE_LC_MESSAGES */
/* Define to 1 if you have the stpcpy function. */ /* Define to 1 if you have the stpcpy function. */
/* #undef HAVE_STPCPY */ /* #undef HAVE_STPCPY */
/* Define to the name of the distribution. */ /* Define to the name of the distribution. */
#define PACKAGE "sane" #define PACKAGE "sane"
/* The concatenation of the strings PACKAGE, "-", and VERSION. */ /* The concatenation of the strings PACKAGE, "-", and VERSION. */
#define PACKAGE_VERSION "sane-0.68" #define PACKAGE_VERSION "sane-0.69"
/* Define to the version of the distribution. */ /* Define to the version of the distribution. */
#define VERSION "0.68" #define VERSION "0.69"
/* Define if you have the __argz_count function. */ /* Define if you have the __argz_count function. */
/* #undef HAVE___ARGZ_COUNT */ /* #undef HAVE___ARGZ_COUNT */
/* Define if you have the __argz_next function. */ /* Define if you have the __argz_next function. */
/* #undef HAVE___ARGZ_NEXT */ /* #undef HAVE___ARGZ_NEXT */
/* Define if you have the __argz_stringify function. */ /* Define if you have the __argz_stringify function. */
/* #undef HAVE___ARGZ_STRINGIFY */ /* #undef HAVE___ARGZ_STRINGIFY */
skipping to change at line 248 skipping to change at line 248
/* Define if you have the <sys/scanio.h> header file. */ /* Define if you have the <sys/scanio.h> header file. */
/* #undef HAVE_SYS_SCANIO_H */ /* #undef HAVE_SYS_SCANIO_H */
/* Define if you have the <bsd/dev/scsireg.h> header file. */ /* Define if you have the <bsd/dev/scsireg.h> header file. */
/* #undef HAVE_BSD_DEV_SCSIREG_H */ /* #undef HAVE_BSD_DEV_SCSIREG_H */
/* Define if you have the <io/cam/cam.h> header file. */ /* Define if you have the <io/cam/cam.h> header file. */
/* #undef HAVE_IO_CAM_CAM_H */ /* #undef HAVE_IO_CAM_CAM_H */
/* Define if you have the <gscdds.h> header file. */
/* #undef HAVE_GSCDDS_H */
/* Define if you have the <os2.h> header file. */ /* Define if you have the <os2.h> header file. */
/* #undef HAVE_OS2_H */ /* #undef HAVE_OS2_H */
/* Define if you have the <unistd.h> header file. */ /* Define if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1 #define HAVE_UNISTD_H 1
/* Define if you have the <values.h> header file. */ /* Define if you have the <values.h> header file. */
/* #undef HAVE_VALUES_H */ /* #undef HAVE_VALUES_H */
/* Define if you have the i library (-li). */ /* Define if you have the i library (-li). */
skipping to change at line 280 skipping to change at line 283
#define HAVE_DLOPEN 1 #define HAVE_DLOPEN 1
/* Define if you have the GIMP header files and library. */ /* Define if you have the GIMP header files and library. */
/* #undef HAVE_LIBGIMP_GIMP_H */ /* #undef HAVE_LIBGIMP_GIMP_H */
#ifndef HAVE_STRNCASECMP #ifndef HAVE_STRNCASECMP
/* OS/2 needs this */ /* OS/2 needs this */
# define strncasecmp(a, b, c) strnicmp(a, b, c) # define strncasecmp(a, b, c) strnicmp(a, b, c)
#endif #endif
#if defined (__sun) && defined (__GNUC__)
# define _POSIX_SOURCE
# define __EXTENSIONS__
#endif
#endif /* SANE_CONFIG_H */ #endif /* SANE_CONFIG_H */
 End of changes. 4 change blocks. 
2 lines changed or deleted 10 lines changed or added


 sane.h   sane.h 
skipping to change at line 95 skipping to change at line 95
typedef struct typedef struct
{ {
SANE_String_Const name; /* unique device name */ SANE_String_Const name; /* unique device name */
SANE_String_Const vendor; /* device vendor string */ SANE_String_Const vendor; /* device vendor string */
SANE_String_Const model; /* device model name */ SANE_String_Const model; /* device model name */
SANE_String_Const type; /* device type (e.g., "flatbed scanner") */ SANE_String_Const type; /* device type (e.g., "flatbed scanner") */
} }
SANE_Device; SANE_Device;
#define SANE_CAP_SOFT_SELECT (1 << 0) #define SANE_CAP_SOFT_SELECT (1 << 0)
#define SANE_CAP_HARD_SELECT (1 << 1) #define SANE_CAP_HARD_SELECT (1 << 1)
#define SANE_CAP_SOFT_DETECT (1 << 2) #define SANE_CAP_SOFT_DETECT (1 << 2)
#define SANE_CAP_EMULATED (1 << 3) #define SANE_CAP_EMULATED (1 << 3)
#define SANE_CAP_AUTOMATIC (1 << 4) #define SANE_CAP_AUTOMATIC (1 << 4)
#define SANE_CAP_INACTIVE (1 << 5) #define SANE_CAP_INACTIVE (1 << 5)
#define SANE_CAP_ADVANCED (1 << 6) #define SANE_CAP_ADVANCED (1 << 6)
#define SANE_CAP_ALWAYS_SETTABLE (1 << 7)
#define SANE_OPTION_IS_ACTIVE(cap) (((cap) & SANE_CAP_INACTIVE) == 0) #define SANE_OPTION_IS_ACTIVE(cap) (((cap) & SANE_CAP_INACTIVE) == 0)
#define SANE_OPTION_IS_SETTABLE(cap) (((cap) & SANE_CAP_SOFT_SELECT) != 0 ) #define SANE_OPTION_IS_SETTABLE(cap) (((cap) & SANE_CAP_SOFT_SELECT) != 0 )
#define SANE_INFO_INEXACT (1 << 0) #define SANE_INFO_INEXACT (1 << 0)
#define SANE_INFO_RELOAD_OPTIONS (1 << 1) #define SANE_INFO_RELOAD_OPTIONS (1 << 1)
#define SANE_INFO_RELOAD_PARAMS (1 << 2) #define SANE_INFO_RELOAD_PARAMS (1 << 2)
typedef enum typedef enum
{ {
 End of changes. 1 change blocks. 
7 lines changed or deleted 8 lines changed or added


 sanei_scsi.h   sanei_scsi.h 
skipping to change at line 29 skipping to change at line 29
Generic interface to SCSI drivers. */ Generic interface to SCSI drivers. */
#ifndef sanei_scsi_h #ifndef sanei_scsi_h
#define sanei_scsi_h #define sanei_scsi_h
#include <sys/types.h> #include <sys/types.h>
#include <sane/sane.h> #include <sane/sane.h>
typedef SANE_Status (*SANEI_SCSI_Sense_Handler) (int fd, typedef SANE_Status (*SANEI_SCSI_Sense_Handler) (int fd,
u_char *sense_buffer); u_char *sense_buffer,
void *arg);
extern int sanei_scsi_max_request_size; extern int sanei_scsi_max_request_size;
extern SANE_Status sanei_scsi_open (const char * device_name, int * fd, extern SANE_Status sanei_scsi_open (const char * device_name, int * fd,
SANEI_SCSI_Sense_Handler sense_handler); SANEI_SCSI_Sense_Handler sense_handler,
void *sense_arg);
/* One or more scsi commands can be enqueued by calling req_enter(). /* One or more scsi commands can be enqueued by calling req_enter().
SRC is the pointer to the SCSI command and associated write data SRC is the pointer to the SCSI command and associated write data
and SRC_SIZE is the length of the command and data. DST is a and SRC_SIZE is the length of the command and data. DST is a
pointer to a buffer in which data is returned (if any). It may be pointer to a buffer in which data is returned (if any). It may be
NULL if no data is returned by the command. On input *DST_SIZE is NULL if no data is returned by the command. On input *DST_SIZE is
the size of the buffer pointed to by DST, on exit, *DST_SIZE is set the size of the buffer pointed to by DST, on exit, *DST_SIZE is set
to the number of bytes returned in the buffer (which is less than to the number of bytes returned in the buffer (which is less than
or equal to the buffer size). DST_SIZE may be NULL if no data is or equal to the buffer size). DST_SIZE may be NULL if no data is
expected. IDP is a pointer to a void* that uniquely identifies expected. IDP is a pointer to a void* that uniquely identifies
 End of changes. 2 change blocks. 
2 lines changed or deleted 4 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/