config.h   config.h 
skipping to change at line 90 skipping to change at line 90
/* 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.61" #define PACKAGE_VERSION "sane-0.62"
/* Define to the version of the distribution. */ /* Define to the version of the distribution. */
#define VERSION "0.61" #define VERSION "0.62"
/* 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 */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 sanei_scsi.h   sanei_scsi.h 
skipping to change at line 35 skipping to change at line 35
#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);
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);
/* One or more scsi commands can be enqueued by calling req_enter().
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
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
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
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
the entered request.
NOTE: Some systems may not support multiple outstanding commands.
On such systems, enter() may block. In other words, it is not
proper to assume that enter() is a non-blocking routine. */
extern SANE_Status sanei_scsi_req_enter (int fd,
const void * src, size_t src_size,
void * dst, size_t * dst_size,
void **idp);
/* Wait for the completion of the SCSI command with id ID. */
extern SANE_Status sanei_scsi_req_wait (void *id);
/* This is a convenience function that is equivalent to a pair of
enter()/wait() calls. */
extern SANE_Status sanei_scsi_cmd (int fd, extern SANE_Status sanei_scsi_cmd (int fd,
const void * src, size_t src_size, const void * src, size_t src_size,
void * dst, size_t * dst_size); void * dst, size_t * dst_size);
/* Flush all pending SCSI commands. */
extern void sanei_scsi_req_flush_all (void);
extern void sanei_scsi_close (int fd); extern void sanei_scsi_close (int fd);
#endif /* sanei_scsi_h */ #endif /* sanei_scsi_h */
 End of changes. 2 change blocks. 
0 lines changed or deleted 29 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/