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

MacOS X updates

merge-requests/1/head
Mattias Ellert 2007-11-10 11:35:34 +00:00
rodzic 93e856b53f
commit 71f9081904
3 zmienionych plików z 12 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
ChangeLog
Wyświetl plik

@ -10,11 +10,12 @@
add a check for IOKit/scsi/SCSICommandOperationCodes.h add a check for IOKit/scsi/SCSICommandOperationCodes.h
* doc/Makefile.in, tools/Makefile.in: disable things that need the * doc/Makefile.in, tools/Makefile.in: disable things that need the
built binaries to run when doing cross-compilations built binaries to run when doing cross-compilations
* sanei/sanei_scsi.c: IOKit/scsi-commands has moved to IOKit/scsi - * sanei/sanei_scsi.c, tools/sane-find-scanner.c: IOKit/scsi-commands
support both locations of headers has moved to IOKit/scsi - support both locations of headers
* aclocal.m4, config.guess, config.sub, configure, sane/config.h.in: * aclocal.m4, config.guess, config.sub, configure,
update autogenerated files include/sane/config.h.in: update autogenerated files
* sane-backends/Makefile.in: remove sanei_config2 from cardscan deps * backends/Makefile.in: remove sanei_config2 from cardscan deps
* backends/dll.c: add MacOS X naming convention for dlopen
2007-11-08 Gerhard Jaeger <gerhard@gjaeger.de> 2007-11-08 Gerhard Jaeger <gerhard@gjaeger.de>

6
backend/dll.c
Wyświetl plik

@ -385,14 +385,16 @@ load (struct backend *be)
# ifdef __hpux # ifdef __hpux
# define POSTFIX ".sl.%u" # define POSTFIX ".sl.%u"
# define ALT_POSTFIX ".so.%u" # define ALT_POSTFIX ".so.%u"
#elif defined (HAVE_WINDOWS_H) # elif defined (HAVE_WINDOWS_H)
# undef PREFIX # undef PREFIX
# define PREFIX "cygsane-" # define PREFIX "cygsane-"
# define POSTFIX "-%u.dll" # define POSTFIX "-%u.dll"
#elif defined (HAVE_OS2_H) # elif defined (HAVE_OS2_H)
# undef PREFIX # undef PREFIX
# define PREFIX "" # define PREFIX ""
# define POSTFIX ".dll" # define POSTFIX ".dll"
# elif defined (__APPLE__) && defined (__MACH__)
# define POSTFIX ".%u.so"
# else # else
# define POSTFIX ".so.%u" # define POSTFIX ".so.%u"
# endif # endif

2
tools/sane-find-scanner.c
Wyświetl plik

@ -819,6 +819,7 @@ static char **build_scsi_dev_list()
#endif #endif
#if defined (HAVE_IOKIT_CDB_IOSCSILIB_H) || \ #if defined (HAVE_IOKIT_CDB_IOSCSILIB_H) || \
defined (HAVE_IOKIT_SCSI_SCSICOMMANDOPERATIONCODES_H) || \
defined (HAVE_IOKIT_SCSI_COMMANDS_SCSICOMMANDOPERATIONCODES_H) defined (HAVE_IOKIT_SCSI_COMMANDS_SCSICOMMANDOPERATIONCODES_H)
char **scsi_dev_list; char **scsi_dev_list;
int scsi_dev_list_index; int scsi_dev_list_index;
@ -1410,6 +1411,7 @@ main (int argc, char **argv)
#if defined (HAVE_WINDOWS_H) || \ #if defined (HAVE_WINDOWS_H) || \
defined (HAVE_IOKIT_CDB_IOSCSILIB_H) || \ defined (HAVE_IOKIT_CDB_IOSCSILIB_H) || \
defined (HAVE_IOKIT_SCSI_SCSICOMMANDOPERATIONCODES_H) || \
defined (HAVE_IOKIT_SCSI_COMMANDS_SCSICOMMANDOPERATIONCODES_H) defined (HAVE_IOKIT_SCSI_COMMANDS_SCSICOMMANDOPERATIONCODES_H)
/* Build a list of valid of possible scanners found */ /* Build a list of valid of possible scanners found */
dev_list = build_scsi_dev_list(); dev_list = build_scsi_dev_list();